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

Trivial merge