Merge branch 'hotfix-0.4.2'
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 17 Jul 2013 12:09:48 +0000 (15:09 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 17 Jul 2013 12:09:48 +0000 (15:09 +0300)

Trivial merge