diff Makefile.am @ 20295:f837139b3732

merge of '554f47773ad015df16569e503432329570fa1564' and '868723337c9f90e7c57c05f7fc0178338339179d'
author Luke Schierer <lschiere@pidgin.im>
date Mon, 01 Oct 2007 16:41:18 +0000
parents 4c26b23e7859
children f34539eb7a61
line wrap: on
line diff