Restrict snort_log_view.php to show only files inside SNORTLOGDIR, it fixes http://seclists.org/fulldisclosure/2014/Jan/187
Merge remote-tracking branch 'upstream/master'
Fix snort_rules_edit.php to address http://seclist.org/fulldisclosure/2014/Jan/187