Merge branch 'develop' into feature-store
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 8 Apr 2013 11:42:11 +0000 (14:42 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 8 Apr 2013 11:42:11 +0000 (14:42 +0300)

Trivial merge