]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/master' into core89
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 12 Apr 2015 20:47:26 +0000 (22:47 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 12 Apr 2015 20:47:26 +0000 (22:47 +0200)
1  2 
config/rootfiles/core/89/update.sh

Simple merge