Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 18 Jul 2012 17:17:45 +0000 (20:17 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 18 Jul 2012 17:17:45 +0000 (20:17 +0300)
commit5b5ad672f60e289d526a9f7b4bbe5b15b124dcef
tree37ccf980427a3ce74d3eb2e3351913397ef61d91
parent666bea95762477cf3769871c85a7aad6fee03969
parent4051c82af10d346e4d6042203d049051e64396f5
Merge branch 'master' into debian-0.9