Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 19 Oct 2013 13:05:42 +0000 (15:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 19 Oct 2013 13:05:42 +0000 (15:05 +0200)
1  2 
lfs/linux

diff --cc lfs/linux
Simple merge