[svn-commits] dlee: branch dlee/stasis-app r381777 - /team/dlee/stasis-app/

[SVN commits to the Digium repositories]

Author: dlee
Date: Tue Feb 19 13:19:38 2013
New Revision: 381777

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381777
Log:
Merged r381769 from http://svn.asterisk.org/svn/asterisk/team/dlee/stasis-core

Modified:
    team/dlee/stasis-app/   (props changed)

Propchange: team/dlee/stasis-app/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/dlee/stasis-app/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 19 13:19:38 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-core:1-381742
+/team/dlee/stasis-core:1-381770