If anyone was interested, this changeset merged w/o any significant problems (one missing file, one renamed file), and it worked as expected solving my problem. -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.strongswan.org/pipermail/users/attachments/20150521/66536894/attachment.html>