]> git.0d.be Git - empathy.git/commitdiff
Merge commit 'ka/tpl-0.1.1'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 1 Mar 2010 12:41:46 +0000 (13:41 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 1 Mar 2010 12:41:46 +0000 (13:41 +0100)

Trivial merge