Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...

author Josh <jrosenba@cisco.com>

Mon, 17 Nov 2014 21:17:12 +0000 (15:17 -0600)

committer Josh <jrosenba@cisco.com>

Mon, 17 Nov 2014 21:17:12 +0000 (15:17 -0600)
author Josh <jrosenba@cisco.com>
Mon, 17 Nov 2014 21:17:12 +0000 (15:17 -0600)
committer Josh <jrosenba@cisco.com>
Mon, 17 Nov 2014 21:17:12 +0000 (15:17 -0600)
diff --cc tools/snort2lua/helpers/parse_cmd_line.cc
Simple merge
author	Josh <jrosenba@cisco.com>
	Mon, 17 Nov 2014 21:17:12 +0000 (15:17 -0600)
committer	Josh <jrosenba@cisco.com>
	Mon, 17 Nov 2014 21:17:12 +0000 (15:17 -0600)