[asterisk-commits] branch file/func_supertimeout - r7289 /team/file/func_supertimeout/

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Dec  2 16:17:59 2005
New Revision: 7289

URL: http://svn.digium.com/view/asterisk?rev=7289&view=rev
Log:
For later merging of upstream revisions

Modified:
    team/file/func_supertimeout/   (props changed)

Propchange: team/file/func_supertimeout/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec  2 16:17:59 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7275
+/branches/1.2:1-7275 /trunk:1-7287