Merge branch 'hotfix-0.12.9' 0.12.9
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 16 Jan 2014 16:38:34 +0000 (18:38 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 16 Jan 2014 16:38:34 +0000 (18:38 +0200)

Trivial merge