From: philsmd <philsmd@hashcat.net>
Date: Sat, 14 May 2016 17:47:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.00~186^2
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=2f7023caa048294e88f395a503841d2d64caa609;p=hashcat.git

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

2f7023caa048294e88f395a503841d2d64caa609