Merge branch 'feature-image' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 31 Jan 2013 15:50:20 +0000 (17:50 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 31 Jan 2013 15:50:20 +0000 (17:50 +0200)

Trivial merge