]> git.ipfire.org Git - people/jschlag/ipfire-2.x.git/commitdiff
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 2 Dec 2015 20:39:20 +0000 (21:39 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 2 Dec 2015 20:39:20 +0000 (21:39 +0100)
1  2 
config/rootfiles/core/96/exclude
config/rootfiles/oldcore/95/filelists/files

Simple merge