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

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Nov 19 07:49:50 2008
New Revision: 157747

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157747
Log:
configure automerge

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

Propchange: team/kpfleming/optional_api/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/kpfleming/optional_api/
------------------------------------------------------------------------------
    automerge-email = kpfleming at digium.com

Propchange: team/kpfleming/optional_api/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 19 07:49:50 2008
@@ -1,1 +1,1 @@
-/trunk:1-157742
+/trunk:1-157746