]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d40a77 eb3f7d2)
Merge branch 'sasl'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 7 Dec 2010 11:54:33 +0000 (11:54 +0000)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 7 Dec 2010 11:54:33 +0000 (11:54 +0000)

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