Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 23 Jan 2016 00:39:19 +0000 (00:39 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 23 Jan 2016 00:39:19 +0000 (00:39 +0000)
1  2 
config/rootfiles/oldcore/96/update.sh

Simple merge