Merge branch 'master' of git.strongswan.org:strongswan
authorAndreas Steffen <andi@brisbane.(none)>
Fri, 26 Nov 2010 13:07:18 +0000 (14:07 +0100)
committerAndreas Steffen <andi@brisbane.(none)>
Fri, 26 Nov 2010 13:07:18 +0000 (14:07 +0100)
commit03a6719f46f1ed174c89d4a05d8acc2adb141d42
treed2cb4108b1a10415a2a621e23768e59360edb243
parent6b7897728ad4d44d363ff49b3bc6c186c38233c3
parent5b2547c7a7cb7b386b6ebbef0e10919bf14d962e
Merge branch 'master' of git.strongswan.org:strongswan