Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/Makefile.am @ 29055:cfca0217d162
merge of '263b34adf7373694b48a494714d66824d6bb3443'
and 'd6f80b7ba5ba2da4ae203eac6f07565721b10ad8'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 29 Nov 2009 17:32:05 +0000 |
parents | 9feec7d1d95c |
children | d9c70a78fad5 cb8b53a6f238 |