Merge remote-tracking branch 'ms/strongswan-next' into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 10:54:31 +0000 (12:54 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 10:54:31 +0000 (12:54 +0200)
commite877f684918ff5007d8b441736ecad3012829529
tree361caa2bd1bd22dfef96fd892d9c6ed0795d720e
parent4f64e2090f61fd68dadbaec989b6cb38ba9d9604
parent05f4061d10a1bacb9a3c60205d8d88b84f216d29
Merge remote-tracking branch 'ms/strongswan-next' into strongswan-next