Merge branch 'develop' into debian-develop
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 13 Feb 2013 13:02:06 +0000 (15:02 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 13 Feb 2013 13:02:06 +0000 (15:02 +0200)

Trivial merge