From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 25 Dec 2013 19:44:24 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into openssl-update
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=37677cf0d1f3306316e08d9244b4e8184d6d2876

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into openssl-update
---

37677cf0d1f3306316e08d9244b4e8184d6d2876