]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 10 Oct 2013 14:07:00 +0000 (10:07 -0400)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 10 Oct 2013 14:07:00 +0000 (10:07 -0400)

Trivial merge