Merge branch 'strongswan-next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Apr 2013 10:41:40 +0000 (12:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Apr 2013 10:41:40 +0000 (12:41 +0200)
commitd7ae74183727a8f5ee99d151610099ec8ea9851d
tree9cad5f04347c8a6382e0748c2ec147648d3c5025
parent49c7a4b8284bbf03019f7b1565ac7d55ba2eacec
parent0cf124ab691a5502923ef69627b96069580861da
Merge branch 'strongswan-next' into next