Merge branch 'develop' into feature-windows
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 18 Dec 2012 12:31:03 +0000 (14:31 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 18 Dec 2012 12:31:03 +0000 (14:31 +0200)

Trivial merge