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)
commit50f696157ff447b332b92588588dbfa5cf98fef3
tree81ca06fc06b5e3bc49cf77dd43463ab2699b6017
parentc331896e29394556a9e620147212d52cf55e70d5
parent499bc000ffd5e65325d1fa9bbf7e1085b62eaea3
Merge commit 'origin/master' into next
lfs/mISDN