From: Matthew Barr <matthew.barr@intel.com>
Date: Fri, 30 Oct 2015 00:29:20 +0000 (+1100)
Subject: Merge develop into master
X-Git-Tag: v4.0.1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe31630221215bd7061bfb4c040052cbd65b09d1;p=thirdparty%2Fvectorscan.git

Merge develop into master
---

fe31630221215bd7061bfb4c040052cbd65b09d1