Merge branch 'feature-image' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 27 Jan 2014 16:22:57 +0000 (18:22 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 27 Jan 2014 16:22:57 +0000 (18:22 +0200)

Trivial merge