From: Matthew Barr <matthew.barr@intel.com>
Date: Wed, 1 Jun 2016 01:09:05 +0000 (+1000)
Subject: Merge branch develop into master
X-Git-Tag: v4.2.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3e0a0fab0594e7530bc2fb53dde28949620f65b;p=thirdparty%2Fvectorscan.git

Merge branch develop into master
---

e3e0a0fab0594e7530bc2fb53dde28949620f65b