]> git.0d.be Git - empathy.git/commit
Merge branch 'zephyr'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 9 Feb 2010 11:56:47 +0000 (11:56 +0000)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 9 Feb 2010 11:56:47 +0000 (11:56 +0000)
commit6595e1660bb1dc21fc7fefb6fe6a9e925f9189c3
treee9fa693ba02b50d1f04ab6f99f957187aa13ebcf
parentfe9e7dd4083299e534a1f82be51d4d092237f994
parent66dd2eb3f37e2ddb0b72f5a31683ca3a2f9b837b
Merge branch 'zephyr'