]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7319558 348652d)
Merge branch 'cancel-crash-629957'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 20 Sep 2010 09:35:38 +0000 (11:35 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 20 Sep 2010 09:35:38 +0000 (11:35 +0200)

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