Merge branch 'develop' into debian-develop
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 8 Feb 2013 11:30:44 +0000 (13:30 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 8 Feb 2013 11:30:44 +0000 (13:30 +0200)

Trivial merge