]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2cd5ba 8160b75)
Merge branch 'nm-asleep-647793'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 15 Apr 2011 09:24:30 +0000 (11:24 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 15 Apr 2011 09:24:30 +0000 (11:24 +0200)

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