Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 14 Jul 2013 10:48:29 +0000 (12:48 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 14 Jul 2013 10:48:29 +0000 (12:48 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge