Merge branch 'gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 9 Sep 2013 14:24:21 +0000 (16:24 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 9 Sep 2013 14:24:21 +0000 (16:24 +0200)
commitd121d6a9b9d4d3a654dfd2b0e900be216f161dba
tree0a7b612abcd2035cd0d7f56008f8e95f05e00ce7
parent9129f3e31d22e7b375f3c90fd2e89e05f5e564eb
parent8c83da990d4791fc91b52856536c3d05f59bc832
Merge branch 'gnome-3-8'

Conflicts:
NEWS
configure.ac
src/empathy-debug-window.c