Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 11 Nov 2013 13:17:06 +0000 (15:17 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 11 Nov 2013 13:17:06 +0000 (15:17 +0200)

Trivial merge