]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'unread-653090'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Jun 2011 11:55:54 +0000 (13:55 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Jun 2011 11:55:54 +0000 (13:55 +0200)

Trivial merge