]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a63cc37 0c0e2b5)
Merge remote branch 'sjoerd/master'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 4 Oct 2010 13:51:47 +0000 (15:51 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 4 Oct 2010 13:51:47 +0000 (15:51 +0200)

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