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)
commit37deb64980a9896e8748fb4cb0fc84c59b95bf89
treea84e1de44411e6451ebb711e3af8da4d75152107
parent7d395c53d8d2fb7f2a5fa496555cb09cbdaa0be9
parent69cd22c4b53c2b25cf5a22180bfddf0784c8db33
Merge branch 'gnome-3-8'
src/empathy-new-chatroom-dialog.c