Merge branch 'master' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Nov 2013 20:43:20 +0000 (21:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Nov 2013 20:43:20 +0000 (21:43 +0100)
commit0fc392d65d513df573573dec57ccf06af2c29a9f
tree4328e74e1a496271edae2b749e17b86920ea894d
parent5702b0cee557ec11ecda43a2482f72f212bffa84
parent303b81f19c37636402d2e5f850cb683e051bbe10
Merge branch 'master' into fifteen
config/rootfiles/oldcore/73/update.sh