Merge branch 'hotfix-0.11.2' 0.11.2
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 22 Oct 2013 10:48:08 +0000 (13:48 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 22 Oct 2013 10:48:08 +0000 (13:48 +0300)

Trivial merge