]> git.0d.be Git - empathy.git/commitdiff
Merge commit 'istaz/handle_none'
authorXavier Claessens <xclaesse@gmail.com>
Sun, 20 Sep 2009 19:53:14 +0000 (21:53 +0200)
committerXavier Claessens <xclaesse@gmail.com>
Sun, 20 Sep 2009 19:53:14 +0000 (21:53 +0200)
1  2 
libempathy-gtk/empathy-chat.c
src/empathy.c

Simple merge
diff --cc src/empathy.c
Simple merge