diff Makefile.am @ 23292:f673b4866283

merge of '4dd6e06680aebbca6a326930f5fff7e65ed87802' and '5dec4714953825272bec5164be3761db1d7fdc9a'
author Ethan Blanton <elb@pidgin.im>
date Thu, 05 Jun 2008 22:40:11 +0000
parents 0085d8b80bc4
children 111b464f6845
line wrap: on
line diff