Merge branch 'hotfix-0.12.8' 0.12.8
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 16 Jan 2014 14:24:11 +0000 (16:24 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 16 Jan 2014 14:24:11 +0000 (16:24 +0200)

Trivial merge