]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5bfa46 f357bd6)
Merge branch 'stable-block-645504'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 22 Mar 2011 13:54:32 +0000 (14:54 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 22 Mar 2011 13:54:32 +0000 (14:54 +0100)

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