Mercurial > pidgin
diff libpurple/protocols/jabber/google.h @ 25968:f0864ef7aa5b
merge of '48260c71a42cee1dd4e220b7c672187cfe99cc2f'
and 'c45d4f4446ba8de761e53590b8f0b67cb7e4acf0'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Wed, 04 Mar 2009 06:29:36 +0000 |
parents | c97e3ab9ef11 |
children | 60f5abc6cf0c e30e9779e7bf |