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

Merge branch develop into master
---

0e5c4cbd1d6fde77a24ad00b1c1fa7925b39bbec