Merge branch 'develop' into feature-adjust-docs
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 14 Jun 2013 11:06:24 +0000 (14:06 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 14 Jun 2013 11:06:24 +0000 (14:06 +0300)

Trivial merge