Merge remote-tracking branch 'upstream/master'
authorphilsmd <philsmd@hashcat.net>
Sun, 3 Jan 2016 18:56:23 +0000 (19:56 +0100)
committerphilsmd <philsmd@hashcat.net>
Sun, 3 Jan 2016 18:56:23 +0000 (19:56 +0100)
commit00d87893462257cd864450c919532d0b1dd64692
treec7e7b793978c0e12632f696c982b0adbc2fc5901
parent483833d06d9222d363358494c4deef7e1ea5cdda
parent0428514f615d4384897a4040f50406d8d530ead5
Merge remote-tracking branch 'upstream/master'