[Forensics-changes] [yara] 200/368: Merge remote-tracking branch 'upstream/master' into sectionreader

[Hilko Bengen]

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

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

commit 0d85a47c879278e2654c771a6666820cb322c61b
Merge: eb82997 786bd6e
Author: Kyle Reed <kallanreed at outlook.com>
Date:   Sun Feb 28 09:46:21 2016 -0800

    Merge remote-tracking branch 'upstream/master' into sectionreader
    
    # Conflicts:
    #	libyara/modules/pe.c
    #	libyara/parser.c

 libyara/modules/pe.c | 18 ++++++------------
 libyara/parser.c     |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

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