[asterisk-commits] trunk - r7916 /trunk/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Jan  9 16:09:15 2006
New Revision: 7916

URL: http://svn.digium.com/view/asterisk?rev=7916&view=rev
Log:
block rev 7915 from being merged into the trunk, since the patch is
not compatible

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Mon Jan  9 16:09:15 2006
@@ -1,1 +1,1 @@
-/branches/1.2:7497
+/branches/1.2:7497,7915