From: Martin Willi <martin@revosec.ch>
Date: Thu, 14 Feb 2013 16:11:35 +0000 (+0100)
Subject: Merge branch 'ike-dscp'
X-Git-Tag: 5.0.3dr2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e212033ef2012ff9be098ce2a9ee0da39c662c31;p=thirdparty%2Fstrongswan.git

Merge branch 'ike-dscp'
---

e212033ef2012ff9be098ce2a9ee0da39c662c31