[svn-commits] dvossel: branch dvossel/generic_aoc r252604 - /team/dvossel/generic_aoc/

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon Mar 15 16:30:50 2010
New Revision: 252604

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=252604
Log:
Initialized merge tracking via "svnmerge" with revisions "1-252601" from 
https://origsvn.digium.com/svn/asterisk/team/rmudgett/aoc_event

Modified:
    team/dvossel/generic_aoc/   (props changed)

Propchange: team/dvossel/generic_aoc/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Mon Mar 15 16:30:50 2010
@@ -1,1 +1,1 @@
-rmudgett at digium.com
+dvossel at digium.com

Propchange: team/dvossel/generic_aoc/
------------------------------------------------------------------------------
--- automerge-propname (original)
+++ automerge-propname Mon Mar 15 16:30:50 2010
@@ -1,1 +1,1 @@
-aoc_event-integrated
+generic_aoc-integrated

Propchange: team/dvossel/generic_aoc/
------------------------------------------------------------------------------
    generic_aoc-integrated = /team/rmudgett/aoc_event:1-252601