Merge branch 'develop'
authorDimitris Aragiorgis <dimara@grnet.gr>
Tue, 18 Feb 2014 13:18:28 +0000 (15:18 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Tue, 18 Feb 2014 13:18:28 +0000 (15:18 +0200)

Trivial merge