Merge branch 'gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 24 May 2013 14:00:49 +0000 (16:00 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 24 May 2013 14:00:49 +0000 (16:00 +0200)
commit9d408bd199a0b577eaec9826df060397578f3a37
tree9f4aebf460948f1196a20893a790fa4c58efde1b
parent138123c86b9e6a6bf67a188d1e67bd0444c7ebff
parentec619f9805258aa9d623e2651fb604b80d49f795
Merge branch 'gnome-3-8'

Conflicts:
NEWS
configure.ac
libempathy-gtk/empathy-log-window.c
src/empathy-debug-window.c
src/empathy-new-chatroom-dialog.c