]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e08ec07 c3716f8)
Merge branch 'gnome-3-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 16 Jan 2013 08:03:28 +0000 (09:03 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 16 Jan 2013 08:03:28 +0000 (09:03 +0100)
Conflicts:
NEWS
configure.ac


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