]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'bug-662727'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 27 Oct 2011 00:49:19 +0000 (11:49 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 27 Oct 2011 00:49:19 +0000 (11:49 +1100)

Trivial merge