]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'muc-password'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 1 Feb 2011 08:50:22 +0000 (08:50 +0000)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 1 Feb 2011 08:50:22 +0000 (08:50 +0000)

Trivial merge