Merge branch 'develop' into release-0.13
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 14 Feb 2013 15:39:07 +0000 (15:39 +0000)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 14 Feb 2013 15:39:07 +0000 (15:39 +0000)

Trivial merge