Merge commit 'elliot/bug-584703-c'
authorXavier Claessens <xclaesse@gmail.com>
Sun, 28 Jun 2009 07:58:53 +0000 (09:58 +0200)
committerXavier Claessens <xclaesse@gmail.com>
Sun, 28 Jun 2009 07:58:53 +0000 (09:58 +0200)
commit5e30d8dcf1b80b6281df6bd872bb4455f28c1b23
tree70b4b92fd0533a19cf724811ceafb94edc14d2f2
parent8ffe9c1d74fa04ed7dfb898a8760469e8df16915
parent240b54dbfe75e1d24a7619cf22e2ffd3acbb6427
Merge commit 'elliot/bug-584703-c'
libempathy/empathy-contact-manager.c