Merge branch 'hotfix-0.12.2' 0.12.2
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 20 Dec 2013 13:41:50 +0000 (15:41 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 20 Dec 2013 13:41:50 +0000 (15:41 +0200)

Trivial merge