]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'contact-info'
authorXavier Claessens <xclaesse@gmail.com>
Mon, 5 Oct 2009 11:29:02 +0000 (13:29 +0200)
committerXavier Claessens <xclaesse@gmail.com>
Mon, 5 Oct 2009 11:29:02 +0000 (13:29 +0200)

Trivial merge