]> git.0d.be Git - empathy.git/commitdiff
Merge remote branch 'sjoerd/misc'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 21 Jun 2010 09:33:42 +0000 (19:33 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 21 Jun 2010 09:33:42 +0000 (19:33 +1000)

Trivial merge