Merge branch 'hotfix-0.12.10' master 0.12.10
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 19 Feb 2014 12:54:03 +0000 (14:54 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 19 Feb 2014 12:54:03 +0000 (14:54 +0200)

Trivial merge