Merge branch 'master' of https://github.com/hashcat/oclHashcat
authorjsteube <jens.steube@gmail.com>
Sun, 3 Jan 2016 20:00:47 +0000 (21:00 +0100)
committerjsteube <jens.steube@gmail.com>
Sun, 3 Jan 2016 20:00:47 +0000 (21:00 +0100)

Trivial merge