Merge branch 'vendor/OPENSSL'
authorSascha Wildner <saw@online.de>
Thu, 9 Jul 2015 17:43:26 +0000 (19:43 +0200)
committerSascha Wildner <saw@online.de>
Thu, 9 Jul 2015 17:43:26 +0000 (19:43 +0200)

Trivial merge