Author: kpfleming Date: Mon May 22 17:02:38 2006 New Revision: 29570 URL: http://svn.digium.com/view/asterisk?rev=29570&view=rev Log: remove properties from the xmpp merge Modified: trunk/ (props changed) Propchange: trunk/ ('automerge-email' removed) Propchange: trunk/ ('svnmerge-integrated' removed)