Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Jul 2012 11:47:32 +0000 (14:47 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Jul 2012 11:47:32 +0000 (14:47 +0300)
commit8ec037d014ac91e967597e7ee0c03da1add01a4e
tree5b8ba84ffe0dcfc00d9dc4c639a4e997578ca17e
parent8e4717b3839003e89d8548130f248b34eb78d43a
parent15b6c13aa85dc50bb09e1d0a5d232af0e037a148
Merge branch 'master' into debian-0.9