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

Trivial merge