]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5694ed5 ea8355c)
Merge branch 'idle-state'
authorJonny Lamb <jonny.lamb@collabora.co.uk>
Fri, 18 Sep 2009 10:52:23 +0000 (11:52 +0100)
committerJonny Lamb <jonny.lamb@collabora.co.uk>
Fri, 18 Sep 2009 10:52:23 +0000 (11:52 +0100)

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