From: Matthew Barr <matthew.barr@intel.com>
Date: Fri, 9 Jun 2017 00:17:04 +0000 (+1000)
Subject: Merge branch develop into master
X-Git-Tag: v4.5.0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a00bd3167cda4d963ed71220cbbb703c06955f2d;p=thirdparty%2Fvectorscan.git

Merge branch develop into master
---

a00bd3167cda4d963ed71220cbbb703c06955f2d