]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98724db ed85fe7)
Merge remote-tracking branch 'wjt/652800-661731-notifications'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 28 Mar 2012 11:48:38 +0000 (13:48 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 28 Mar 2012 11:48:38 +0000 (13:48 +0200)

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