]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'debug-get-protocols-612523'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Wed, 2 Jun 2010 01:11:48 +0000 (11:11 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Wed, 2 Jun 2010 01:11:48 +0000 (11:11 +1000)

Trivial merge