Merge branch 'master' into debian astakos/debian/v0.7.2
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 2 Aug 2012 17:14:55 +0000 (20:14 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 2 Aug 2012 17:14:55 +0000 (20:14 +0300)
commitecfd439fe71283eb53f51c065ba95ca088428df4
tree6e0c6229f08d2ff1614b5d4d40ee5543bcecfb9a
parentb55bdad649bb72aa465bd003334a70ef2056bb79
parent8df55b7a996ee9ae45a372444aebbd9701c6eb92
Merge branch 'master' into debian