diff Makefile.am @ 30435:d487a2adc3a6

merge of '86d9ff7ca5af691007b1e85ef39959fa13e7d996' and 'd0cbcbb1a25505fd8801dd556c1ec42e98414c9a'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 23 Aug 2010 05:22:11 +0000
parents a14c2e81fcf0
children a7cf3dbaba02 3b4e12c42d3c
line wrap: on
line diff