]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02cc95c 4e2b408)
Merge remote branch 'lfrb/ft-cancel'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 11 Aug 2010 15:28:01 +0000 (17:28 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 11 Aug 2010 15:28:01 +0000 (17:28 +0200)

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