Merge branch 'vendor/OPENSSL' into rel3_6
authorSascha Wildner <saw@online.de>
Fri, 6 Jun 2014 17:05:23 +0000 (19:05 +0200)
committerSascha Wildner <saw@online.de>
Fri, 6 Jun 2014 17:05:23 +0000 (19:05 +0200)
commit85607912b5a359daec7bd43a6e72d2b41e761593
treebecd4137323e2c0a7860068d3d597fc731d38708
parentc9b7f958828346d858209087d0d68f98fca04f86
parent4bb195ec3a948415fae3237631f3bbc3d17cd2c9
Merge branch 'vendor/OPENSSL' into rel3_6