]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7a63b4 e624601)
Merge branch 'irc-widget-588243'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 26 Aug 2010 12:03:11 +0000 (14:03 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 26 Aug 2010 12:03:11 +0000 (14:03 +0200)

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