[asterisk-commits] russell: branch russell/events r121594 - /team/russell/events/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jun 10 12:09:20 2008
New Revision: 121594

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121594
Log:
resolve, reset

Modified:
    team/russell/events/   (props changed)

Propchange: team/russell/events/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 10 12:09:20 2008
@@ -1,1 +1,1 @@
-/trunk:1-121555
+/trunk:1-121593