[Forensics-changes] [yara] 327/407: Merge branch 'master' into issue_231

[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 35f096131fa40c3f565f5b0fe871bf49f320bc62
Merge: 100405e e378aa1
Author: Wesley Shields <wxs at atarininja.org>
Date:   Wed Jan 7 15:06:15 2015 -0500

    Merge branch 'master' into issue_231

 libyara/atoms.c  | 6 +++---
 libyara/object.c | 3 ++-
 libyara/parser.c | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

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