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 20:00:14 +0000 (22:00 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Jul 2013 20:00:14 +0000 (22:00 +0200)
commit5e9b7dd2c3c0d242c06a48450fef81fcfb5fa29a
treee21b5d2ef3783aa0511878ef82dc75164dc128f7
parente0cdf670a3d79b6d607f7eade6d99743f5cd5769
parent15be554282c3c424d5d9eab9de62f6fde4203585
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
config/rootfiles/common/strongswan
lfs/strongswan