]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91085fb 43db9e7)
Merge branch 'vino-621998'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 21 Jun 2010 12:19:12 +0000 (14:19 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 21 Jun 2010 12:19:12 +0000 (14:19 +0200)

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