]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'trrrrrrrrrrrrrivia'
authorJonny Lamb <jonnylamb@gnome.org>
Fri, 16 Oct 2009 22:01:25 +0000 (23:01 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Fri, 16 Oct 2009 22:01:25 +0000 (23:01 +0100)

Trivial merge