]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f8e3b0 33ee7a9)
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)
Conflicts:
configure.ac


Trivial merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)