Merge branch 'vendor/OPENSSL'
authorSascha Wildner <saw@online.de>
Thu, 11 Jun 2015 19:04:28 +0000 (21:04 +0200)
committerSascha Wildner <saw@online.de>
Thu, 11 Jun 2015 19:04:28 +0000 (21:04 +0200)

Trivial merge