Merge branch 'develop' into feature-image
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 11 Apr 2013 15:00:36 +0000 (18:00 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 11 Apr 2013 15:00:36 +0000 (18:00 +0300)

Trivial merge