[Forensics-changes] [yara] 76/407: Merge branch 'master' into richpe

[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 4a652883e94d5545f5e08f238aa430258cebf98d
Merge: ff6646c e5369ca
Author: Wesley Shields <wxs at atarininja.org>
Date:   Fri Oct 3 21:01:52 2014 -0400

    Merge branch 'master' into richpe

 libyara/atoms.c      | 22 +++++++++++++++++++---
 libyara/modules/pe.c | 12 +++++++++++-
 2 files changed, 30 insertions(+), 4 deletions(-)


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