Merge branch 'hotfix-0.12.3' 0.12.3
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 7 Jan 2014 15:13:44 +0000 (17:13 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 7 Jan 2014 15:13:44 +0000 (17:13 +0200)

Trivial merge