From: Stavros Sachtouris <saxtouri@admin.grnet.gr>
Date: Tue, 2 Apr 2013 10:44:15 +0000 (+0300)
Subject: Merge branch 'develop' of https://code.grnet.gr/git/kamaki into develop
X-Git-Tag: 0.9rc1~79
X-Git-Url: https://code.grnet.gr/git/kamaki/commitdiff_plain/2fe6acd1a8b7496d6a9cfc9995d180c4c3023718

Merge branch 'develop' of https://code.grnet.gr/git/kamaki into develop
---

2fe6acd1a8b7496d6a9cfc9995d180c4c3023718