Mercurial > pidgin.yaz
diff pidgin/gtkplugin.c @ 29737:bf4a33bd020b
merge of '0990bc18c1ec4f05a29aeb8f55d4d28a08152cc6'
and 'd5e93b05ae1a8f5296a0a9b069c630630285d3c3'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Fri, 25 Dec 2009 21:33:50 +0000 |
parents | 48ea900ee72a |
children | c8a5c09df242 |