]> git.0d.be Git - empathy.git/commit
Merge remote branch 'lfrb/ft-cancel'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 11 Aug 2010 15:28:01 +0000 (17:28 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 11 Aug 2010 15:28:01 +0000 (17:28 +0200)
commitadacbe4f6ef767063a0727368de48cecef1f8fb6
treeadd4bc6607d7fdf49faf735554be26e1b23d7430
parent02cc95c188b9b29e91b0e6ffae5325c20b10377a
parent4e2b40828d4f8c7fd4cbaf27ff345ce2adb4ffcf
Merge remote branch 'lfrb/ft-cancel'