Merge branch 'release-0.13' into debian-develop
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 14 Feb 2013 16:58:34 +0000 (16:58 +0000)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 14 Feb 2013 16:58:34 +0000 (16:58 +0000)

Trivial merge