]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba8f9b6 c448b89)
Merge branch 'butterfly-networkid'
authorJonny Lamb <jonnylamb@gnome.org>
Mon, 15 Mar 2010 08:09:56 +0000 (08:09 +0000)
committerJonny Lamb <jonnylamb@gnome.org>
Mon, 15 Mar 2010 08:09:56 +0000 (08:09 +0000)

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