[zaptel-commits] sruffell: branch sruffell/voicebus r3938 - /team/sruffell/voicebus/

[SVN commits to the Zaptel project]

Author: sruffell
Date: Wed Mar  5 13:28:22 2008
New Revision: 3938

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3938
Log:
Resolving conflicts reported by automerge.

Modified:
    team/sruffell/voicebus/   (props changed)

Propchange: team/sruffell/voicebus/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar  5 13:28:22 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-3890
+/branches/1.4:1-3937