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)

Trivial merge