Mercurial > pidgin.yaz
diff pidgin/Makefile.am @ 31382:8d0e0ac0bf97
merge of '903a08541756b999683e95bd5bd022856dbc122b'
and 'b79e497f79e3a9b2b2427ec0350936eea95838ee'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 21 Nov 2010 10:38:27 +0000 |
parents | 812c1cc9661c |
children | e81c1e7ed278 |