[asterisk-commits] irroot: branch irroot/t38gateway-1.8 r322008 - /team/irroot/t38gateway-1.8/

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat Jun  4 07:54:30 2011
New Revision: 322008

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322008
Log:
Resolve Conflicts / Merge

Modified:
    team/irroot/t38gateway-1.8/   (props changed)

Propchange: team/irroot/t38gateway-1.8/
------------------------------------------------------------------------------
    svnmerge-integrated = /branches/1.8:1-318978