Merge branch 'next' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Oct 2013 12:12:12 +0000 (13:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Oct 2013 12:12:12 +0000 (13:12 +0100)
1  2 
lfs/strongswan
make.sh

diff --cc lfs/strongswan
Simple merge
diff --cc make.sh
Simple merge