Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Mon, 2 Apr 2012 14:32:51 +0000 (17:32 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Mon, 2 Apr 2012 14:32:51 +0000 (17:32 +0300)
commitbc21a56bf6bc235677e35a7169fe3ad8ca6fdced
tree13ee1275ae78e9d5a772806c54a1be85219f383a
parent21f2d08f8f1ebdf57d6c864bbd06ff32059297c4
parentcb507cf0311722782b29e0a0452bd3ba6d64e09f
Merge branch 'master' into debian-0.9