Merge branch 'master' into prereleasev2.0.5_RC1
commitc6629b2fc78992cdefbc50bbbf55f40f6dff3b97
authorStephen Lombardo <sjlombardo@zetetic.net>
Fri, 18 May 2012 15:15:36 +0000 (18 11:15 -0400)
committerStephen Lombardo <sjlombardo@zetetic.net>
Fri, 18 May 2012 15:15:36 +0000 (18 11:15 -0400)
tree9f6ac9b8355d66cc7a06047a0ac2a725beaf3e23
parenta125d2299705c359b54a27c041de261b9adfb004
parentac8385cb1465a4c564cd6fdf2f78ebf93cf9a110
Merge branch 'master' into prerelease
src/crypto.c