[dahdi-commits] kpfleming: branch linux/kpfleming/echocan_work r6367 - /linux/team/kpfleming/...

[SVN commits to the DAHDI project]

Author: kpfleming
Date: Tue Apr 14 14:38:37 2009
New Revision: 6367

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6367
Log:
enable merging

Modified:
    linux/team/kpfleming/echocan_work/   (props changed)

Propchange: linux/team/kpfleming/echocan_work/
------------------------------------------------------------------------------
    automerge = *

Propchange: linux/team/kpfleming/echocan_work/
------------------------------------------------------------------------------
    automerge-email = kpfleming at digium.com

Propchange: linux/team/kpfleming/echocan_work/
------------------------------------------------------------------------------
    svnmerge-integrated = /linux/trunk:1-6354