]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c487a45 212a4ec)
Merge branch 'notifications-635500'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 25 Nov 2010 09:25:44 +0000 (10:25 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 25 Nov 2010 09:25:44 +0000 (10:25 +0100)

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