Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Sat, 18 Jun 2011 05:50:48 +0000 (07:50 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 18 Jun 2011 05:50:48 +0000 (07:50 +0200)
commit00675c949494888ac5f3cd802de41bf6f2caf45b
treed434cfdf6594dbb6112b067cf4fd7bac37885c37
parent5adba778b0e1d1b73555b561a5acfae23e9ba66c
parent9516e1d117d1dcf88db7ead53f950c66850c6fcb
Merge branch 'tarballs' into release

Conflicts:
scripts/DumpWeakCerts.pl
scripts/mail-weak-keys.php