]> git.0d.be Git - empathy.git/commitdiff
Fix conflict after rebase
authorCosimo Cecchi <cosimoc@gnome.org>
Mon, 1 Jun 2009 16:02:03 +0000 (18:02 +0200)
committerCosimo Cecchi <cosimoc@gnome.org>
Mon, 1 Jun 2009 16:02:03 +0000 (18:02 +0200)

No differences found