Merge branch 'vendor/OPENSSL'
authorSascha Wildner <saw@online.de>
Thu, 7 Aug 2014 21:22:26 +0000 (23:22 +0200)
committerSascha Wildner <saw@online.de>
Thu, 7 Aug 2014 21:22:26 +0000 (23:22 +0200)

Trivial merge