Merge branch 'feature-update-docs' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 4 Feb 2014 13:49:32 +0000 (15:49 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 4 Feb 2014 13:49:32 +0000 (15:49 +0200)

Trivial merge