[asterisk-commits] kpfleming: trunk r43393 - /trunk/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Sep 20 18:02:25 2006
New Revision: 43393

URL: http://svn.digium.com/view/asterisk?rev=43393&view=rev
Log:
this has been manually merged

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Sep 20 18:02:25 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388
+/branches/1.4:1-43376,43383,43386,43388,43392