Merge pull request #1101 from jariq/master
authorAlex Rønne Petersen <alex@lycus.org>
Mon, 16 Jun 2014 12:54:30 +0000 (14:54 +0200)
committerAlex Rønne Petersen <alex@lycus.org>
Mon, 16 Jun 2014 12:54:30 +0000 (14:54 +0200)
Support both unencrypted PKCS#12 and PKCS#12 encrypted with an empty pas...


Trivial merge