Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr
authorSuper User <root@isdn.jolly.ten>
Mon, 28 Apr 2008 17:34:33 +0000 (19:34 +0200)
committerSuper User <root@isdn.jolly.ten>
Mon, 28 Apr 2008 17:34:33 +0000 (19:34 +0200)
commitf94f30b0c56ae49c436ee588cd0696cc1b9db9aa
tree82e91a47b4a0e71dbcde6c94e3be8c8918083070
parentd70150d0470f76ea769da623ac8f50e828609b61
parent350450b9cadc6107449fe2630843d4f898f680b7
Merge branch 'master' of ssh://jolly@mISDN.org/var/git/lcr

Conflicts:

chan_lcr.c
chan_lcr.c
chan_lcr.h