[Forensics-changes] [yara] 406/407: Merge branch 'master' of https://github.com/plusvic/yara

[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 ec05041a7c7fbfce613c3c9d9ac4743af7bd6654
Merge: 7fa2c1f 6468404
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Tue Feb 10 13:04:05 2015 +0100

    Merge branch 'master' of https://github.com/plusvic/yara

 yara-python/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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