[asterisk-commits] dvossel: branch dvossel/hd_conferencing_ftw r307896 - /team/dvossel/hd_confer...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Feb 15 10:53:01 2011
New Revision: 307896

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307896
Log:
Fix automerge to only pull from my other team branch

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

Propchange: team/dvossel/hd_conferencing_ftw/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 15 10:53:01 2011
@@ -1,1 +1,1 @@
-/team/dvossel/fixtheworld_phase2:1-307832 /trunk:1-307811
+/team/dvossel/fixtheworld_phase2:1-307832