Merge branch 'feature-update-docs' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 7 Feb 2014 16:48:57 +0000 (18:48 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 7 Feb 2014 16:48:57 +0000 (18:48 +0200)

Trivial merge