From: Stavros Sachtouris <saxtouri@admin.grnet.gr>
Date: Mon, 8 Apr 2013 11:42:11 +0000 (+0300)
Subject: Merge branch 'develop' into feature-store
X-Git-Tag: 0.9rc1~61^2~5
X-Git-Url: https://code.grnet.gr/git/kamaki/commitdiff_plain/d1be083658c12bff0e9eea91f6fe257961d2ed52

Merge branch 'develop' into feature-store
---

d1be083658c12bff0e9eea91f6fe257961d2ed52