Microsoft Internet Explorer Conditional Comments translator improvements
URLClassifier - TDS rules
Java WebStart JNLP Security Warning Bypass (CVE-2013-2423) handling
URLClassifier - added a Styx Exploit Kite rule and minor changes
URLClassifier - RedKit Exploit Kit rules
URLClassifier - added two Blackhole Exploit Kite rules
URLClassifier - Sweet Orange Exploit Kit rules
Minor fix
BeautifulSoup 4.2.0 deprecated `has_key' method
Set the analysis timeout in seconds instead of minutes
Minor change
URLClassifier - Fiesta Exploit Kit rules
URLClassifier - SofosFO Exploit Kit rules
URLClassifier - Popads Exploit Kit rules
URLClassifier - Sakura Exploit Kit rules
URLClassifier - Neutrino Exploit Kit rules
Merge remote-tracking branch 'upstream/master'