Merge branch 'master' of git.strongswan.org:~/strongswan into HEAD
authorTobias Brunner <tobias@strongswan.org>
Thu, 7 May 2009 15:47:48 +0000 (17:47 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 7 May 2009 15:47:48 +0000 (17:47 +0200)
commitca39743f06ea7fa761819f625ddbdd373bfd65dc
tree35677ecfbeec9a21e5a355be040d339cfade3e26
parent5533a8893624a5444086ad12fde92cf7584da038
parent0ce19b27a6ad79fa12b7401da5b579f3019ca9b6
Merge branch 'master' of git.strongswan.org:~/strongswan into HEAD