]> git.0d.be Git - empathy.git/commitdiff
Merge remote branch 'glassrose/full_room_menu_never_insensitivated-597043'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 26 Nov 2010 02:02:23 +0000 (13:02 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 26 Nov 2010 02:02:23 +0000 (13:02 +1100)

Trivial merge