Merge branch 'master' into debian
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 5 Nov 2012 11:41:01 +0000 (13:41 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 5 Nov 2012 11:41:01 +0000 (13:41 +0200)
commit6894bcf8ac778b956224ef5a5db96d97101a66b7
tree8a022173c756c0f86bc5b11874a2779d4d59adb7
parentf396cf35cd05e97709fe743d3ef225b054238ab3
parentcf5c6de502e57d9f20da3ad6f693b1cb21fb51b4
Merge branch 'master' into debian