[Merge] lp:~inaddy/ubuntu/trusty/suricata/lp-1250439 into lp:ubuntu/trusty/suricata

[Brian Murray]

This has already been uploaded to trusty-proposed.

https://code.launchpad.net/~ubuntu-branches/ubuntu/trusty/suricata/trusty-proposed
-- 
https://code.launchpad.net/~inaddy/ubuntu/trusty/suricata/lp-1250439/+merge/216963
Your team Ubuntu branches is requested to review the proposed merge of lp:~inaddy/ubuntu/trusty/suricata/lp-1250439 into lp:ubuntu/trusty/suricata.