Mercurial > pidgin
diff acinclude.m4 @ 32768:f01d6c9f3492
explicit merge of 'c5b3879b829a5067b2189e4393ca3b80f6fd96c3'
and '90634d4a19f4639f388839e3efc46791f1ee31ab'
to branch 'im.pidgin.pidgin'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 06 Apr 2012 04:30:00 +0000 |
| parents | 0d4a41a50168 |
| children |
