]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'fix-headers-597293'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 5 Oct 2009 12:37:47 +0000 (13:37 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 5 Oct 2009 12:37:47 +0000 (13:37 +0100)

Trivial merge