[asterisk-commits] kpfleming: branch kpfleming/optional_api r157742 - /team/kpfleming/optional_api/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Nov 19 07:36:48 2008
New Revision: 157742

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157742
Log:
setup merging

Modified:
    team/kpfleming/optional_api/   (props changed)

Propchange: team/kpfleming/optional_api/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-157234