Merge branch 'master' into debian astakos/debian/v0.3.0
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 28 Feb 2012 15:06:41 +0000 (17:06 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 28 Feb 2012 15:06:41 +0000 (17:06 +0200)
commit6f38ce61fe7be8bba056f8ba4ee23a77fa931638
tree6a290c19781e618191f591869354ab7df142dbe7
parentac48994193cb8c3abb4d869169c1e538d9e1c51f
parentc3ef34eff3f9a33a35580a8501a4277336f638c9
Merge branch 'master' into debian