Merge remote-tracking branch 'upstream/master'
authorphilsmd <philsmd@hashcat.net>
Sun, 6 Dec 2015 15:12:25 +0000 (16:12 +0100)
committerphilsmd <philsmd@hashcat.net>
Sun, 6 Dec 2015 15:12:25 +0000 (16:12 +0100)

Trivial merge