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)

Trivial merge