Merge branch 'develop'
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 6 Feb 2014 10:38:39 +0000 (12:38 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 6 Feb 2014 10:38:39 +0000 (12:38 +0200)

Trivial merge