From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 8 Jan 2014 14:01:24 +0000 (+0100)
Subject: Merge commit '961f3dbcd8675f8b62ecd2404a709e47ec2ae343' into fifteen
X-Git-Tag: v2.15-beta1~19^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a51528487b0d04de80f4e79555595445de9d23cc;p=ipfire-2.x.git

Merge commit '961f3dbcd8675f8b62ecd2404a709e47ec2ae343' into fifteen
---

a51528487b0d04de80f4e79555595445de9d23cc