Merge branch 'debug'
authorJonny Lamb <jonny.lamb@collabora.co.uk>
Thu, 4 Jun 2009 16:09:44 +0000 (17:09 +0100)
committerJonny Lamb <jonny.lamb@collabora.co.uk>
Thu, 4 Jun 2009 16:09:44 +0000 (17:09 +0100)
commitb1d33938778faa1faa3687e87bb8646d6668992d
tree4c1676f40a867ae06462f3e788b710912a56eea9
parentb788f7ca76096138b65f4518fb4435608cd0f91f
parentc06f26d8c999b47c22dcd78f07140d027e8882c7
Merge branch 'debug'

Conflicts:
extensions/Makefile.am
extensions/misc.xml
po/POTFILES.in

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
extensions/Makefile.am
extensions/misc.xml
po/POTFILES.in
src/Makefile.am
src/empathy-main-window.c
src/empathy-main-window.ui