[Forensics-changes] [yara] 16/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 0d41b8f004e3819221ec32868445d683d83be7e9
Merge: a475171 11ffa88
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Mon Jun 5 18:41:40 2017 +0200

    Merge branch 'master' into 3.6

 libyara/parser.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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