[Forensics-changes] [yara] 14/17: Merge branch 'master' into 3.6

[Hilko Bengen]

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

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

commit a4751714f9d05eacebb6e07c29bf764f98d60b31
Merge: 925bcf3 10e8bd3
Author: Victor Manuel Alvarez <vmalvarez at vmalvarez-macbookpro.roam.corp.google.com>
Date:   Mon Jun 5 17:05:26 2017 +0200

    Merge branch 'master' into 3.6

 docs/writingrules.rst | 101 ++++++++++++++++++-------------------
 libyara/hex_grammar.c | 136 ++++++++++++++++++++++++++++----------------------
 libyara/hex_grammar.h |   4 +-
 libyara/hex_grammar.y |  14 ++++++
 4 files changed, 142 insertions(+), 113 deletions(-)

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