Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 11 May 2012 12:06:59 +0000 (14:06 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 11 May 2012 12:06:59 +0000 (14:06 +0200)
commitbf6dffc184ccc08ec6bf38c4a59898d137375097
tree294bc5ea0fc3efa6b80d22a5cfa8f38e8960d0ce
parent9dff9efa4a2d03634a4f2186c05a7e42a886d619
parent815e5728059c269de3c0a19612a7fc3077957390
Merge branch 'gnome-3-4'
libempathy-gtk/empathy-account-widget-irc.ui