Merge branch 'strongswan-5' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Oct 2012 22:30:33 +0000 (00:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Oct 2012 22:30:33 +0000 (00:30 +0200)

Trivial merge