]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1570d9b 08d9529)
Merge branch 'presence-manager-640532'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 26 Jan 2011 08:30:07 +0000 (09:30 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 26 Jan 2011 08:30:07 +0000 (09:30 +0100)

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