Merge branch 'develop' into feature-tests
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 19 Feb 2013 16:21:56 +0000 (18:21 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 19 Feb 2013 16:21:56 +0000 (18:21 +0200)

Trivial merge