Merge branch 'develop'
authorNikos Skalkotos <skalkoto@grnet.gr>
Sun, 4 Aug 2013 18:10:11 +0000 (21:10 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Sun, 4 Aug 2013 18:10:11 +0000 (21:10 +0300)

Trivial merge