From: Stavros Sachtouris <saxtouri@admin.grnet.gr>
Date: Wed, 11 Dec 2013 11:00:27 +0000 (+0200)
Subject: Merge branch 'hotfix-0.11.4'
X-Git-Tag: 0.11.4^0
X-Git-Url: https://code.grnet.gr/git/kamaki/commitdiff_plain/d65d838e211083e0fba546104fa7fcf16ee84ee7

Merge branch 'hotfix-0.11.4'
---

d65d838e211083e0fba546104fa7fcf16ee84ee7