From: radix <radix@hashcat.net>
Date: Fri, 27 May 2016 02:38:34 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.00~131^2~1
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=bb332eaa7132c5e09a4c04a2ed56234a4b0a7310;p=hashcat.git

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

bb332eaa7132c5e09a4c04a2ed56234a4b0a7310