Merge branch 'hotfix-0.5.2'
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 9 Sep 2013 08:05:23 +0000 (11:05 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 9 Sep 2013 08:05:23 +0000 (11:05 +0300)

Trivial merge