Merge remote-tracking branch 'upstream/master'
authorradix <radix@hashcat.net>
Fri, 27 May 2016 02:38:34 +0000 (21:38 -0500)
committerradix <radix@hashcat.net>
Fri, 27 May 2016 02:38:34 +0000 (21:38 -0500)
1  2 
src/hashcat.c

diff --cc src/hashcat.c
Simple merge