projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8daec65 a1461f4)
Merge remote-tracking branch 'em/trivia'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 13 Mar 2012 10:31:50 +0000 (11:31 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 13 Mar 2012 10:31:50 +0000 (11:31 +0100)

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