]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'pmuc'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 22 Dec 2009 10:56:31 +0000 (21:56 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 22 Dec 2009 10:56:31 +0000 (21:56 +1100)

Trivial merge