]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83912b1 f31d0fb)
Merge branch 'ft-error-confusion'
authorWill Thompson <will.thompson@collabora.co.uk>
Tue, 9 Jun 2009 18:08:23 +0000 (19:08 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Tue, 9 Jun 2009 18:08:23 +0000 (19:08 +0100)

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