]> git.0d.be Git - empathy.git/commitdiff
Merge commit 'treitter/bug-613272'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 29 Mar 2010 08:48:19 +0000 (10:48 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 29 Mar 2010 08:48:19 +0000 (10:48 +0200)
1  2 
libempathy-gtk/empathy-account-widget-jabber.ui
src/empathy-accounts-dialog.c

Simple merge