Merge branch 'develop' into release-0.8
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 18 Apr 2013 13:17:04 +0000 (16:17 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 18 Apr 2013 13:17:04 +0000 (16:17 +0300)

Trivial merge