Merge branch 'develop' into debian-develop
authorDimitris Aragiorgis <dimara@grnet.gr>
Sat, 7 Dec 2013 14:46:31 +0000 (16:46 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Sat, 7 Dec 2013 14:46:31 +0000 (16:46 +0200)

Trivial merge