Merge branch 'develop' into feature-adjust-docs
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 17 Jun 2013 09:15:33 +0000 (12:15 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 17 Jun 2013 09:15:33 +0000 (12:15 +0300)

Trivial merge