From: Matthew Barr <matthew.barr@intel.com>
Date: Fri, 20 Jan 2017 03:16:41 +0000 (+1100)
Subject: Merge branch develop into master
X-Git-Tag: v4.4.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4c2fc3b9b39c865fa02725a5c7fefa3c9fb5c68;p=thirdparty%2Fvectorscan.git

Merge branch develop into master
---

f4c2fc3b9b39c865fa02725a5c7fefa3c9fb5c68