]> git.ipfire.org Git - people/arne_f/ipfire-2.x.git/commitdiff
Merge branch 'next'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Jul 2015 08:42:56 +0000 (10:42 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Jul 2015 08:42:56 +0000 (10:42 +0200)
1  2 
config/rootfiles/oldcore/91/update.sh

Simple merge