[asterisk-commits] branch tilghman/res_odbc_rewrite r9588 - /team/tilghman/res_odbc_rewrite/

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sat Feb 11 12:52:54 2006
New Revision: 9588

URL: http://svn.digium.com/view/asterisk?rev=9588&view=rev
Log:
Restart automerge after conflict

Modified:
    team/tilghman/res_odbc_rewrite/   (props changed)

Propchange: team/tilghman/res_odbc_rewrite/
------------------------------------------------------------------------------
    automerge = *