Merge branch 'trivia'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 22 Oct 2009 13:37:26 +0000 (14:37 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 22 Oct 2009 13:37:26 +0000 (14:37 +0100)
1  2 
libempathy-gtk/empathy-avatar-chooser.c