Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
Conflicts:
make.sh

1  2 
config/rootfiles/common/armv5tel/initscripts
lfs/initscripts
lfs/strongswan
make.sh

diff --cc lfs/initscripts
index 4894710,f656c72..f656c72
mode 100755,100644..100755
diff --cc lfs/strongswan
Simple merge
diff --cc make.sh
Simple merge