]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a585fb5 ce67f69)
Merge commit 'ksz/can_stream_tube'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 1 Jun 2009 14:47:55 +0000 (15:47 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 1 Jun 2009 14:47:55 +0000 (15:47 +0100)

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