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)
commitbf9a484fb83ecf2e5d9d67f6f58d48b6b262fc67
treea2b20cc44ef83b6b4340c3d1cf1a095f7330bc49
parent3f7ae7b7158e6d15a273815c676e63794346fffe
parenta0da39f67c87e5084904c3f6d2e6d4202ca5bcfb
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
make.sh