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)
commitbfb75bb92f7e1a4aa93a9e144b781faf03df93eb
tree700eb3afadb8e17d8035a92ee0e30ab018adb495
parent13699e023a50f88055f24c0230c28a7163c8356d
parent247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb
Merge branch 'approvers-redone-599158'
src/empathy-event-manager.c
src/empathy.c