Merge branch 'shunt-policies-routes'
authorTobias Brunner <tobias@strongswan.org>
Thu, 19 Jun 2014 12:33:50 +0000 (14:33 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 19 Jun 2014 12:33:50 +0000 (14:33 +0200)
commit93c68fcd263dbdb7219686a14266186b25d019e2
tree9bf8f3840be0986fb8d60c3f25eeb25b519558e2
parent73b22aa842ae0f32d3aaeb79101894cc719ceaf2
parent88f125f5605e54b38cf8913df79e32ec6bddff10
Merge branch 'shunt-policies-routes'

Fixes #599.