Merge branch 'next' v2.15-core85
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Oct 2014 09:36:21 +0000 (11:36 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Oct 2014 09:36:21 +0000 (11:36 +0200)
Conflicts:
make.sh


Trivial merge