]> git.0d.be Git - empathy.git/commit
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)
commita7a632c6fc92759d927b18a020c76e5c9b848d69
tree109b65c700326ad3741cd3f7ec3cbe91a2a77848
parent826cb45814d5fc9c6431454b673e2748f584d347
parentc7fab422d11a4e107c5585fa22ab145af16d812b
Merge remote branch 'smcv/conference'