Merge branch 'master' of https://github.com/hashcat/oclHashcat
authorjsteube <jens.steube@gmail.com>
Sun, 17 Jan 2016 21:18:10 +0000 (22:18 +0100)
committerjsteube <jens.steube@gmail.com>
Sun, 17 Jan 2016 21:18:10 +0000 (22:18 +0100)

Trivial merge