[asterisk-commits] kmoore: branch kmoore/bridge_construction-cel_bridging r389080 - /team/kmoore...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Sat May 18 16:03:10 2013
New Revision: 389080

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389080
Log:
resolve merge issue

Modified:
    team/kmoore/bridge_construction-cel_bridging/   (props changed)

Propchange: team/kmoore/bridge_construction-cel_bridging/
------------------------------------------------------------------------------
--- bc-cel_bridging-integrated (original)
+++ bc-cel_bridging-integrated Sat May 18 16:03:10 2013
@@ -1,1 +1,1 @@
-/team/kmoore/bridge_construction-cel_channels:1-389074
+/team/kmoore/bridge_construction-cel_channels:1-389079