]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'contact-id'
authorXavier Claessens <xclaesse@gmail.com>
Wed, 23 Sep 2009 13:36:39 +0000 (15:36 +0200)
committerXavier Claessens <xclaesse@gmail.com>
Wed, 23 Sep 2009 13:36:39 +0000 (15:36 +0200)

Trivial merge