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)
Fixes #599.


Trivial merge