Merge branch 'master' into debian-0.11
authorDimitris Aragiorgis <dimara@grnet.gr>
Sun, 4 Nov 2012 19:24:52 +0000 (21:24 +0200)
committerDimitris Aragiorgis <dimara@grnet.gr>
Sun, 4 Nov 2012 19:24:52 +0000 (21:24 +0200)
commita432c9f32f3099ecfe0f6c05f148bcf33990e560
treebaa6ff129a3a3778a9e13f422d1bf6a3b0a5ea32
parentd1cadefda651ee1560759852496241a3b2c6e7ee
parent9be26fe181ec4b59536b4fb190f5070ad1bc122e
Merge branch 'master' into debian-0.11