[svn-commits] dvossel: branch dvossel/hd_conferencing_ftw r307834 - /team/dvossel/hd_confer...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon Feb 14 17:06:30 2011
New Revision: 307834

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307834
Log:
svnmerge and automerge init

Modified:
    team/dvossel/hd_conferencing_ftw/   (props changed)

Propchange: team/dvossel/hd_conferencing_ftw/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 14 17:06:30 2011
@@ -1,1 +1,1 @@
-/trunk:1-307811
+/team/dvossel/fixtheworld_phase2:1-307832 /trunk:1-307811