]> git.0d.be Git - empathy.git/commit
Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Sat, 12 Oct 2013 21:51:39 +0000 (17:51 -0400)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Sat, 12 Oct 2013 21:51:39 +0000 (17:51 -0400)
commit5719d87e280399be56970a84bfd7419e5baa7e8f
tree225fe9bc47990de788ac2d84f5725711f9a1a9f7
parent5f8e3b0e2da0a65b77cd8d45f187a9f417ba22c0
parent33ee7a9336197b3b43d87a90c667920b1c5c7e00
Merge branch 'gnome-3-10'

Conflicts:
configure.ac