From: Stavros Sachtouris <saxtouri@admin.grnet.gr>
Date: Thu, 16 Jan 2014 16:38:34 +0000 (+0200)
Subject: Merge branch 'hotfix-0.12.9'
X-Git-Tag: 0.12.9^0
X-Git-Url: https://code.grnet.gr/git/kamaki/commitdiff_plain/80225941c13a67e137f8a42d2c111abc4d808a6d

Merge branch 'hotfix-0.12.9'
---

80225941c13a67e137f8a42d2c111abc4d808a6d