Merge branch 'openssl-update' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Dec 2013 12:32:38 +0000 (13:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Dec 2013 12:32:38 +0000 (13:32 +0100)

Trivial merge