Merge branch 'master' of ssh://schlaile@git.misdn.org/var/git/lcr

author Peter Schlaile <root@asterisk.schlaile.de>

Thu, 9 Oct 2008 18:31:40 +0000 (20:31 +0200)

committer root <root@asterisk.schlaile.de>

Thu, 9 Oct 2008 18:31:40 +0000 (20:31 +0200)
author Peter Schlaile <root@asterisk.schlaile.de>
Thu, 9 Oct 2008 18:31:40 +0000 (20:31 +0200)
committer root <root@asterisk.schlaile.de>
Thu, 9 Oct 2008 18:31:40 +0000 (20:31 +0200)
diff --cc chan_lcr.c
Simple merge
diff --cc chan_lcr.h
Simple merge
author	Peter Schlaile <root@asterisk.schlaile.de>
	Thu, 9 Oct 2008 18:31:40 +0000 (20:31 +0200)
committer	root <root@asterisk.schlaile.de>
	Thu, 9 Oct 2008 18:31:40 +0000 (20:31 +0200)
		1	2
chan_lcr.c	patch \|	diff1 \|	diff2 \|	blob \| history
chan_lcr.h	patch \|	diff1 \|	diff2 \|	blob \| history