[svn-commits] qwell: branch group/ast_storage r79433 - /team/group/ast_storage/

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Aug 14 12:11:50 2007
New Revision: 79433

URL: http://svn.digium.com/view/asterisk?view=rev&rev=79433
Log:
Reenable automerge.  Add my email address for merge conflicts.

Modified:
    team/group/ast_storage/   (props changed)

Propchange: team/group/ast_storage/
------------------------------------------------------------------------------
--- automerge (added)
+++ automerge Tue Aug 14 12:11:50 2007
@@ -1,0 +1,1 @@
+moo

Propchange: team/group/ast_storage/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Tue Aug 14 12:11:50 2007
@@ -1,1 +1,1 @@
-tilghman at mail.jeffandtilghman.com
+tilghman at mail.jeffandtilghman.com, qwell at digium.com