Merge branch 'develop'
authorDimitris Aragiorgis <dimara@grnet.gr>
Wed, 19 Feb 2014 18:16:46 +0000 (20:16 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Wed, 19 Feb 2014 18:16:46 +0000 (20:16 +0200)

Trivial merge