Merge branch 'feature-store' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 30 Jan 2013 13:14:41 +0000 (15:14 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 30 Jan 2013 13:14:41 +0000 (15:14 +0200)

Trivial merge