Merge branch 'hotfix-0.12.3'
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 7 Jan 2014 10:01:32 +0000 (12:01 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 7 Jan 2014 10:01:32 +0000 (12:01 +0200)

Trivial merge