From: philsmd <philsmd@hashcat.net>
Date: Sun, 3 Jan 2016 18:56:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.00-beta~561^2
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=00d87893462257cd864450c919532d0b1dd64692;p=hashcat.git

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

00d87893462257cd864450c919532d0b1dd64692