Merge branch 'hotfix-0.4.4'
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 31 Jul 2013 12:49:53 +0000 (15:49 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 31 Jul 2013 12:49:53 +0000 (15:49 +0300)

Trivial merge