[asterisk-commits] kmoore: branch kmoore/stasis-channel_events r384294 - /team/kmoore/stasis-cha...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Mar 28 13:35:08 2013
New Revision: 384294

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384294
Log:
fix svnmerge-integrated

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

Propchange: team/kmoore/stasis-channel_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 28 13:35:08 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-app:1-383941 /trunk:1-383765
+/team/dlee/stasis-app:1-383941