Merge branch 'master' of git+ssh://xclaesse@git.collabora.co.uk/git/empathy
commit0baf6ab43efc3ee94af6120a29d440f374e0388f
authorXavier Claessens <xclaesse@gmail.com>
Sat, 5 Jan 2008 14:59:39 +0000 (5 15:59 +0100)
committerXavier Claessens <xclaesse@gmail.com>
Sat, 5 Jan 2008 14:59:39 +0000 (5 15:59 +0100)
treeec89687c42574a075d79b679124bf8d5d4e1ae55
parenta07cb624afe33826a596934770eb36a87aae658c
parent9776db336c2d7f44158e00b2863b65bf177d1667
Merge branch 'master' of git+ssh://xclaesse@git.collabora.co.uk/git/empathy