Mercurial > pidgin
diff Makefile.am @ 29502:5802999803db
merge of 'bbf372ad40c4d6c10e323048d26215e4769e079c'
and 'd6b03d30f4751e3fa383c0e15a03515536f9b57c'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 28 Feb 2010 19:19:37 +0000 |
parents | 558ce0b09e0e |
children | f7d03842b9c9 |