Merge branch 'approvers-redone-599158'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 18 Jun 2010 16:11:58 +0000 (18:11 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 18 Jun 2010 16:11:58 +0000 (18:11 +0200)
1  2 
src/empathy-event-manager.c
src/empathy.c

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