From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Dec 2013 12:32:38 +0000 (+0100)
Subject: Merge branch 'openssl-update' into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=ec8c14746c56ec725896d94663ba844260d9c0f2

Merge branch 'openssl-update' into fifteen
---

ec8c14746c56ec725896d94663ba844260d9c0f2