Merge branch 'gnome-3-8'
authorXavier Claessens <xavier.claessens@collabora.co.uk>
Tue, 11 Jun 2013 09:34:34 +0000 (11:34 +0200)
committerXavier Claessens <xavier.claessens@collabora.co.uk>
Tue, 11 Jun 2013 09:34:34 +0000 (11:34 +0200)
1  2 
src/empathy-new-chatroom-dialog.c

Simple merge