Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Mar 2016 06:09:02 +0000 (07:09 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Mar 2016 06:09:02 +0000 (07:09 +0100)
commit4a6cfe51a16575c7100862e2cc6f959bc48c6628
tree2637cc330a9e1b5b503c411852c594689691e264
parent64835e022c52d24432d201bd4d57f1aa962c1f90
parent75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0
Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
config/rootfiles/oldcore/98/update.sh
make.sh