]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f83fcfb 204eecf)
Merge branch 'conference-tp-glib-630709'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 29 Sep 2010 15:37:26 +0000 (17:37 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 29 Sep 2010 15:37:26 +0000 (17:37 +0200)

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