]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/master' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 3 Aug 2012 14:40:50 +0000 (16:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 3 Aug 2012 14:40:50 +0000 (16:40 +0200)
1  2 
config/rootfiles/common/armv5tel/glibc
config/rootfiles/common/i586/glibc

Simple merge