Merge branch 'feature-image-register-bug' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 9 Jan 2014 12:33:15 +0000 (14:33 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 9 Jan 2014 12:33:15 +0000 (14:33 +0200)

Trivial merge