]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ffe9c1 240b54d)
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)
1  2 
libempathy/empathy-contact-manager.c patch | diff1 | diff2 | blob | history

diff --cc libempathy/empathy-contact-manager.c
Simple merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)