Merge remote-tracking branch 'upstream/master'
authorphilsmd <philsmd@hashcat.net>
Tue, 5 Jul 2016 13:13:45 +0000 (15:13 +0200)
committerphilsmd <philsmd@hashcat.net>
Tue, 5 Jul 2016 13:13:45 +0000 (15:13 +0200)
commitf326c5de4c5ecc09fb9801e709885ddeafa6c67c
tree1ae7cf2f30fbb9641ac7c6fbfebb9109a607c374
parent067c0b8e838536f2caae1306a8407de872164721
parent69e3e3956825895b642b4651a3ddc744a95ca26e
Merge remote-tracking branch 'upstream/master'

Conflicts:
docs/changes.txt
docs/changes.txt
src/hashcat.c