]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'search-bar'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 23 Aug 2011 08:31:28 +0000 (09:31 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 23 Aug 2011 08:31:28 +0000 (09:31 +0100)

Trivial merge