Merge branch 'release-0.14' into debian-release-0.14
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 19 Jun 2013 11:50:05 +0000 (14:50 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 19 Jun 2013 11:50:05 +0000 (14:50 +0300)

Trivial merge