projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e02bd4d 8fd2851)
Merge branch 'gnome-3-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 24 Jan 2013 14:14:25 +0000 (15:14 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 24 Jan 2013 14:14:25 +0000 (15:14 +0100)

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