]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'mc5-debug'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 27 Oct 2009 09:29:42 +0000 (20:29 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 27 Oct 2009 09:29:42 +0000 (20:29 +1100)

Trivial merge