From: Jens Steube <jens.steube@gmail.com>
Date: Fri, 1 Jan 2016 00:09:24 +0000 (+0100)
Subject: Merge branch 'master' into GetRidOfCUDA
X-Git-Tag: v3.00-beta~584^2
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=6893a9ad857a1d4fe63f1a92365802f5d9d3b39e;p=hashcat.git

Merge branch 'master' into GetRidOfCUDA

Conflicts:
	docs/BUILD.md
---

6893a9ad857a1d4fe63f1a92365802f5d9d3b39e