[asterisk-commits] kmoore: branch kmoore/stasis-channel_events-take2 r384363 - /team/kmoore/stas...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Mar 29 14:59:34 2013
New Revision: 384363

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384363
Log:
svnmerge and automerge initx

Modified:
    team/kmoore/stasis-channel_events-take2/   (props changed)

Propchange: team/kmoore/stasis-channel_events-take2/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/kmoore/stasis-channel_events-take2/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Fri Mar 29 14:59:34 2013
@@ -1,1 +1,1 @@
-dlee at digium.com
+kmoore at digium.com

Propchange: team/kmoore/stasis-channel_events-take2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 29 14:59:34 2013
@@ -1,1 +1,1 @@
-/trunk:1-384291
+/team/dlee/stasis-app:1-384361