Merge branch 'vendor/OPENSSL'
authorSascha Wildner <saw@online.de>
Wed, 2 Mar 2016 09:32:33 +0000 (10:32 +0100)
committerSascha Wildner <saw@online.de>
Wed, 2 Mar 2016 09:32:33 +0000 (10:32 +0100)

Trivial merge