Merge remote-tracking branch 'stevee/core-76-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 28 Jan 2014 19:49:32 +0000 (20:49 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 28 Jan 2014 19:49:32 +0000 (20:49 +0100)
1  2 
config/rootfiles/core/76/update.sh

Simple merge