[Forensics-changes] [yara] 254/407: Merge branch 'master' into resource_name_and_entropy

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.3.0
in repository yara.

commit a64c1553967b2e53895bfeb05ce9903f554d9bdf
Merge: c8c0925 963f1ba
Author: Wesley Shields <wxs at atarininja.org>
Date:   Thu Dec 18 00:21:52 2014 -0500

    Merge branch 'master' into resource_name_and_entropy

 libyara/modules/pe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git