Merge remote-tracking branch 'origin/next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Dec 2013 09:05:39 +0000 (10:05 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Dec 2013 09:05:39 +0000 (10:05 +0100)
commit30f68903d339fdb2e1a0b3ff62b6b770fee9ca36
treea637d4df2190f58aeb14e68383d9caa0e157544e
parent562e14b01f02f811ed4c5c98e563aa2de2d9caf4
parent5cd3a05bf0653726834489c87b80064584e6073b
Merge remote-tracking branch 'origin/next' into fifteen
config/rootfiles/common/configroot
lfs/configroot
lfs/strongswan
make.sh