From: philsmd <philsmd@hashcat.net>
Date: Sun, 6 Dec 2015 15:12:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.00-beta~604^2
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=3f79ac59648d15372f4d91ed1967a346dfe0b7a0;p=hashcat.git

Merge remote-tracking branch 'upstream/master'
---

3f79ac59648d15372f4d91ed1967a346dfe0b7a0