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

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon Apr  8 08:31:11 2013
New Revision: 384880

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384880
Log:
Rebase on trunk

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

Propchange: team/kmoore/stasis-channel_events-take2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr  8 08:31:11 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-app:1-384825
+/trunk:1-384825