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)
commit207c9813bc3e1ef121bb1bac89752c0a850dda6d
treea2953b1bbed1942717c1b3c9629d90c9729cf35f
parent421102e775e8822f0c48f730dff86efc8cd20ce8
parentb8e25fcdcd8ce84791799d332b43ea06dde46919
Merge branch 'strongswan-5' into thirteen