]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'status-dialog'
authorWill Thompson <will.thompson@collabora.co.uk>
Fri, 24 Jun 2011 13:28:23 +0000 (14:28 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Fri, 24 Jun 2011 13:28:31 +0000 (14:28 +0100)
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

Trivial merge