[Forensics-changes] [yara] 09/17: Merge branch '3.6' of https://github.com/VirusTotal/yara 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 aa871746d89010ea96272344d993675e982fbe52
Merge: 0c735b6 291691d
Author: Victor Manuel Alvarez <vmalvarez at vmalvarez-macbookpro.roam.corp.google.com>
Date:   Sun May 28 13:52:12 2017 +0200

    Merge branch '3.6' of https://github.com/VirusTotal/yara into 3.6

 libyara/modules/magic.c |   8 ++++++--
 libyara/modules/pe.c    |  25 +++++++++++++++----------
 tests/data/tiny-overlay | Bin 0 -> 32775 bytes
 tests/test-pe.c         |  16 ++++++++++++++++
 4 files changed, 37 insertions(+), 12 deletions(-)

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