Merge branch 'feature-store' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 21 Jan 2013 16:02:09 +0000 (18:02 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 21 Jan 2013 16:02:09 +0000 (18:02 +0200)

Trivial merge