Merge branch 'develop'
authorDimitris Aragiorgis <dimara@grnet.gr>
Tue, 14 Jan 2014 10:53:19 +0000 (12:53 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Tue, 14 Jan 2014 10:53:19 +0000 (12:53 +0200)

Trivial merge