]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb0e2e0 ff49ee8)
Merge remote branch 'pwith/634754-folks-api-changes'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Nov 2010 09:54:18 +0000 (10:54 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Nov 2010 09:54:18 +0000 (10:54 +0100)

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