Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Jul 2013 10:04:00 +0000 (12:04 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Jul 2013 10:04:00 +0000 (12:04 +0200)
commitf4dd02f2b6b5b74ca71160d76039c06af7b1992f
treec3889f42964e118437d1b17b9f45955e7a6f95c1
parent82efdd4f22af3a3f37c99444c1ee65934920ea24
parent15f78770b1d4ee730dca39166590393e3b24a666
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
make.sh