Merge branch 'master' of git+ssh://xclaesse@git.collabora.co.uk/git/empathy
commit7aa9cf9f355528a69abf402359a8215621b87166
authorXavier Claessens <xclaesse@gmail.com>
Sat, 5 Jan 2008 15:03:30 +0000 (5 16:03 +0100)
committerXavier Claessens <xclaesse@gmail.com>
Sat, 5 Jan 2008 15:03:30 +0000 (5 16:03 +0100)
treeef2ab8653c0e75b6d321d4342c088ed68cddef46
parent800566908fd8d9d87aafa25224e204c342050b13
parent0baf6ab43efc3ee94af6120a29d440f374e0388f
Merge branch 'master' of git+ssh://xclaesse@git.collabora.co.uk/git/empathy