Mercurial > pidgin.yaz
diff pidgin/Makefile.am @ 32122:84152881ad5d
merge of '6c48da37034a572986f08a85f9d99927f511b9d3'
and 'b22fe1b183e37298da577f19bdca6f318b209324'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Tue, 14 Jun 2011 01:08:49 +0000 |
parents | e81c1e7ed278 |
children | 3b4e12c42d3c 66a445eb2b84 e1cc8d07fe07 |