Merge branch 'release-0.15' into debian-release-0.15
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 11 Dec 2013 10:08:33 +0000 (12:08 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 11 Dec 2013 10:08:33 +0000 (12:08 +0200)
commitc86c9c7030a2c6e16d8a00a89e5808774d0779ee
treed13315163a85f455cdf1248080d911891c8b1a6b
parentad20d1b06e5a6f3900f8fce4ce6809c1be2dbcd9
parent370c921bf5736058779400cf03f722981dfa3763
Merge branch 'release-0.15' into debian-release-0.15