Merge branch 'ikev1-fragmentation'
authorTobias Brunner <tobias@strongswan.org>
Sat, 12 Jan 2013 10:58:26 +0000 (11:58 +0100)
committerTobias Brunner <tobias@strongswan.org>
Sat, 12 Jan 2013 10:58:26 +0000 (11:58 +0100)
commit21235e1ec247b1d1bd58096f72d4f0dc21cec66f
tree97f8ee3441c0c2ec6c3318a4b02b836a4edf91ab
parent54a1a75b2f5f3a9419eb5c18c07173827d5c9b39
parentf31b418094f2f9deb9a69244bf01e8d5dd4c3337
Merge branch 'ikev1-fragmentation'

This adds support for the proprietary IKEv1 fragmentation extension.

Conflicts:
NEWS
NEWS
src/libcharon/plugins/stroke/stroke_config.c