Merge branch 'vendor/OPENSSL'
authorSascha Wildner <saw@online.de>
Fri, 6 Jun 2014 15:51:29 +0000 (17:51 +0200)
committerSascha Wildner <saw@online.de>
Fri, 6 Jun 2014 15:51:29 +0000 (17:51 +0200)

Trivial merge