]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b747b97 eac81f0)
Merge branch 'ft-misc'
authorJonny Lamb <jonny.lamb@collabora.co.uk>
Sat, 25 Apr 2009 10:20:24 +0000 (11:20 +0100)
committerJonny Lamb <jonny.lamb@collabora.co.uk>
Sat, 25 Apr 2009 10:20:24 +0000 (11:20 +0100)

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