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)
commitec8c14746c56ec725896d94663ba844260d9c0f2
tree209e43b7900da971851d0aa80ffbecf8eee9a4f4
parent8dafd717bcbbc22d27d365134f31d9007a11111e
parent6db53091a36311e217188cb4ede6a2add82070c2
Merge branch 'openssl-update' into fifteen