]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 826cb45 c7fab42)
Merge remote branch 'smcv/conference'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 14 Sep 2010 08:21:03 +0000 (10:21 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 14 Sep 2010 08:21:03 +0000 (10:21 +0200)

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