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)
commit17fec9762e1680828a73efb59f7ed155219763ac
treea1ebe2d3f0a050e98b1c81ecf9dcf0d727d4b8ec
parentf0c1f00b3562294709827d1463b3d605e0f09f40
Fix conflict after rebase
src/empathy.c