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)
commit4091a94508e8d4485c98dd64c5a3fe1c7282986c
tree8bfa60dc9ae3cb37e3828f5692b43af3a57d8665
parent52dae2ba3f341a928613c832ebe1db042a4f8702
parentf797c74a2b8eaeaa359f52acf56ec3d3ba72f52d
Merge branch 'next'

Conflicts:
make.sh