From: Matthew Barr <matthew.barr@intel.com>
Date: Wed, 26 Jul 2017 06:11:00 +0000 (+1000)
Subject: Merge branch develop into master
X-Git-Tag: v4.5.2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7097ff3e63fda89408e5582ff91d997fa27c02e5;p=thirdparty%2Fvectorscan.git

Merge branch develop into master
---

7097ff3e63fda89408e5582ff91d997fa27c02e5