]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe9e7dd 66dd2eb)
Merge branch 'zephyr'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 9 Feb 2010 11:56:47 +0000 (11:56 +0000)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 9 Feb 2010 11:56:47 +0000 (11:56 +0000)

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