[asterisk-commits] trunk - r8563 /trunk/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Jan 24 13:29:32 2006
New Revision: 8563

URL: http://svn.digium.com/view/asterisk?rev=8563&view=rev
Log:
Blocking fix from 1.2 from being applied again. 

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Tue Jan 24 13:29:32 2006
@@ -1,1 +1,1 @@
-/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112,8394,8412,8418,8445
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112,8394,8412,8418,8445,8562