Merge branch 'feature-store' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 29 Jan 2013 14:45:23 +0000 (16:45 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 29 Jan 2013 14:45:23 +0000 (16:45 +0200)

Trivial merge