Merge branch 'gnome-3-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 8 Jan 2013 11:38:01 +0000 (12:38 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 8 Jan 2013 11:38:01 +0000 (12:38 +0100)
1  2 
src/empathy-roster-window.c

Simple merge