]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'requests'. Fixes: #598905
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>
Wed, 24 Feb 2010 20:14:24 +0000 (20:14 +0000)
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>
Wed, 24 Feb 2010 20:14:30 +0000 (20:14 +0000)

Trivial merge