[Forensics-changes] [yara] 95/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 7afe1c3d23cb05f164362af80140cb344cd065bb
Merge: a9d7b78 c0c1761
Author: Wesley Shields <wxs at atarininja.org>
Date:   Fri Oct 10 10:53:14 2014 -0400

    Merge branch 'master' into richpe

 AUTHORS      | 1 +
 CONTRIBUTORS | 1 +
 2 files changed, 2 insertions(+)

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