Merge branch 'develop' into feature-tests
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 22 Mar 2013 12:02:46 +0000 (14:02 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 22 Mar 2013 12:02:46 +0000 (14:02 +0200)

Trivial merge