Merge branch 'feature-store' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 19 Feb 2013 13:47:56 +0000 (15:47 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 19 Feb 2013 13:47:56 +0000 (15:47 +0200)

Trivial merge