inliniac/suricata — pull request #818 by inliniac (2014-02-04 15:21:22+00:00)
Title: Conf Override

Rebase of https://github.com/inliniac/suricata/pull/705

Rebase w/o conflicts.

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/176
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/96