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)
commit5dd66017b88e4a0d248ff75e26f12c45a959a7fa
tree3c615b376a4c3cdda96b86b5b8ff1d15644b51f2
parent7fd0b32b8fb6ad3fe29c46ed2afe2bdd25d6687e
parentd95a09bded20a2cccf0847f4663fd075536399ca
Merge branch 'gnome-3-6'
src/empathy-roster-window.c