[asterisk-commits] snuffy: branch snuffy/ao2_jabber r144419 - /team/snuffy/ao2_jabber/

[SVN commits to the Asterisk project]

Author: snuffy
Date: Thu Sep 25 08:22:59 2008
New Revision: 144419

URL: http://svn.digium.com/view/asterisk?view=rev&rev=144419
Log:
automerge.. cough

Modified:
    team/snuffy/ao2_jabber/   (props changed)

Propchange: team/snuffy/ao2_jabber/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/snuffy/ao2_jabber/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/snuffy/ao2_jabber/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/snuffy/ao2_jabber/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 25 08:22:59 2008
@@ -1,1 +1,1 @@
-/trunk:1-142269
+/trunk:1-144417