Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 26 Sep 2013 14:03:32 +0000 (17:03 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 26 Sep 2013 14:03:32 +0000 (17:03 +0300)

Trivial merge