Merge branch 'master' into openbsd_integration
authorMichael Rash <mbr@cipherdyne.org>
Sun, 27 May 2012 01:31:45 +0000 (21:31 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sun, 27 May 2012 01:31:45 +0000 (21:31 -0400)
commit36296995a15c75ee40c083e07dbfe812d814040f
tree8624912e09b2bf784e3805c1571a9022b50f8754
parent791e3894db803ee7524ead69ef81597c2933aa0c
parent8dedbcad794e3b539f2df202feb8a15b50e6e75a
Merge branch 'master' into openbsd_integration