diff Makefile.am @ 30950:e946cb06faec

merge of '3d06a17dd5bf8095f142141e395986dda870cfe6' and 'f34878b425fc3e5501d82254e87d1d9271470428'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 22 Nov 2010 03:04:17 +0000
parents a14c2e81fcf0
children a7cf3dbaba02 3b4e12c42d3c
line wrap: on
line diff