Mercurial > pidgin
diff Makefile.am @ 30517:105437d8253f
propagate from branch 'im.pidgin.pidgin' (head d5a2e2287440ac7134c201e66921754bd4187ba9)
to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 6d5f3264173d13362030c57e5372ffbbfbdef53d)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:22:19 +0000 |
parents | 558ce0b09e0e |
children | f7d03842b9c9 |