Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr
authorAndreas Eversberg <jolly@eversberg.eu>
Sun, 20 Dec 2009 17:55:56 +0000 (18:55 +0100)
committerAndreas Eversberg <jolly@eversberg.eu>
Sun, 20 Dec 2009 17:55:56 +0000 (18:55 +0100)
1  2 
gsm_conf.c

diff --cc gsm_conf.c
Simple merge