[asterisk-commits] kharwell: branch kharwell/stasis-http-conf r383521 - /team/kharwell/stasis-ht...

[SVN commits to the Asterisk project]

Author: kharwell
Date: Thu Mar 21 13:04:56 2013
New Revision: 383521

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383521
Log:
Initialized merge tracking via "svnmerge" with revisions "1-383519" from 
http://svn.asterisk.org/svn/asterisk/team/dlee/stasis-http

Modified:
    team/kharwell/stasis-http-conf/   (props changed)

Propchange: team/kharwell/stasis-http-conf/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/kharwell/stasis-http-conf/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Thu Mar 21 13:04:56 2013
@@ -1,1 +1,1 @@
-dlee at digium.com
+kharwell at digium.com

Propchange: team/kharwell/stasis-http-conf/
------------------------------------------------------------------------------
    automerge-propname = stasis-http-conf-integrated

Propchange: team/kharwell/stasis-http-conf/
------------------------------------------------------------------------------
    stasis-http-conf-integrated = /team/dlee/stasis-http:1-383519