[asterisk-commits] twilson: branch twilson/res_config_sqlite3 r331305 - /team/twilson/res_config...

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Aug  9 18:34:57 2011
New Revision: 331305

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331305
Log:
svn/auto merge stuff

Modified:
    team/twilson/res_config_sqlite3/   (props changed)

Propchange: team/twilson/res_config_sqlite3/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/twilson/res_config_sqlite3/
------------------------------------------------------------------------------
    automerge-email = twilson at digium.com

Propchange: team/twilson/res_config_sqlite3/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-331263