Merge branch 'feature-store' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 17 Apr 2013 09:37:52 +0000 (12:37 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 17 Apr 2013 09:37:52 +0000 (12:37 +0300)

Trivial merge