Merge branch 'hotfix-0.12.6' 0.12.6
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 13 Jan 2014 13:08:40 +0000 (15:08 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 13 Jan 2014 13:08:40 +0000 (15:08 +0200)

Trivial merge