From: huica <huica@cisco.com>
Date: Thu, 23 Jul 2015 15:10:07 +0000 (-0400)
Subject: Merge branch 'master' of
X-Git-Tag: 3.0.0-233~828^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f176a02a9fa0dbd67d0cf1bea3ea70aa920024b;p=thirdparty%2Fsnort3.git

Merge branch 'master' of
ssh://huica@chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort++ into
fileclass2

Conflicts:
	src/file_api/Makefile.am
---

5f176a02a9fa0dbd67d0cf1bea3ea70aa920024b