From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Sep 2014 10:21:18 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.15-core84~8^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6796d144a772c40a4e6a82d6b9d1db8299fac6e;p=ipfire-2.x.git

Merge branch 'master' into next
---

d6796d144a772c40a4e6a82d6b9d1db8299fac6e