Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr
authorSuper User <root@isdn.jolly.ten>
Sat, 26 Apr 2008 08:34:29 +0000 (10:34 +0200)
committerSuper User <root@isdn.jolly.ten>
Sat, 26 Apr 2008 08:34:29 +0000 (10:34 +0200)
commit27b95197734350cc99c29929c2527f2c6d5541d6
treef619478a6398443070549cc411a21dcecb4d209f
parent55a263bc1edd568d2fb85fcd2a8f3d118bebbeff
parent8038fd190f3c0b451c07253190ec1d7de9ea822a
Merge branch 'master' of ssh://jolly@mISDN.org/var/git/lcr

Conflicts:

chan_lcr.c
chan_lcr.c