Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 10 Nov 2010 21:01:28 +0000 (22:01 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 10 Nov 2010 21:01:28 +0000 (22:01 +0100)
1  2 
lfs/mISDN

diff --cc lfs/mISDN
Simple merge