[Forensics-changes] [yara] 46/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 1b48ae8dd217fd85d55f45a8ad8f0eb49c03b292
Merge: 55c6c83 5ae1a05
Author: Wesley Shields <wxs at atarininja.org>
Date:   Fri Sep 19 08:38:52 2014 -0400

    Merge branch 'master' into richpe

 docs/capi.rst                | 21 ++++++++++++++++++++-
 libyara/include/yara/rules.h |  4 ++++
 libyara/rules.c              | 32 ++++++--------------------------
 yara-python/yara-python.c    | 10 ++--------
 4 files changed, 32 insertions(+), 35 deletions(-)

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