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)
commit665f79926d025fec413531c397ccd6998583237e
treec8e4832df37bdadbd3c599daca7a99987c9af127
parent92e4521572f0a5a6411ce74a7a70b9b65dcebb26
parentc26171b4b4d6606e2e64bb9c4de36223fea0924d
Merge remote-tracking branch 'origin/master' into next
config/rootfiles/oldcore/96/update.sh