From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 27 Apr 2016 19:34:49 +0000 (-0400)
Subject: Merge pull request #435 in SNORT/snort3 from ~JOCORNET/snort3:refactor_extras to... 
X-Git-Tag: 3.0.0-233~418
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11690e4;p=thirdparty%2Fsnort3.git

Merge pull request #435 in SNORT/snort3 from ~JOCORNET/snort3:refactor_extras to master

* commit '783a2f028723b9a7b5f5c58f35d1d50e5c922adc':
  fixed merge conflicts
  fix merge conflicts in extra
  rename examples -> src
  rename examples -> src
  re-added extra/COPYING
  updated snort email address in configure.ac
  updated LICENSE + README
  merged in changes
  fixed make distcheck, cmake & make install
  imported refactored extras
  rebased from master
---

11690e4936f0bf3df3fc3e59e122307365360dad