Merge branch 'vendor/OPENSSL'
authorSascha Wildner <saw@online.de>
Sat, 13 Jun 2015 16:29:49 +0000 (18:29 +0200)
committerSascha Wildner <saw@online.de>
Sat, 13 Jun 2015 16:29:49 +0000 (18:29 +0200)
commita84b4b13b1b8edc3d694052e196685861128f52c
tree682e535b7940d3455f4006482d8da678256a650d
parent87749d8aae86cbee3353ec4a6c273691b67c1204
parentc0e4fa118162302ab6d33e0264e7c63eaea7c6c8
Merge branch 'vendor/OPENSSL'