Merge branch 'develop' into feature-store
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 17 Apr 2013 08:34:14 +0000 (11:34 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 17 Apr 2013 08:34:14 +0000 (11:34 +0300)

Trivial merge