Merge branch 'hotfix-0.11.4' 0.11.4
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 11 Dec 2013 11:00:27 +0000 (13:00 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 11 Dec 2013 11:00:27 +0000 (13:00 +0200)

Trivial merge