]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'profile-chooser'
authorJonny Lamb <jonny.lamb@collabora.co.uk>
Sun, 7 Jun 2009 13:35:11 +0000 (14:35 +0100)
committerJonny Lamb <jonny.lamb@collabora.co.uk>
Sun, 7 Jun 2009 13:35:11 +0000 (14:35 +0100)

Trivial merge