From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 19 Jul 2014 09:34:50 +0000 (+0200)
Subject: Merge branch 'cr_fix' of https://github.com/hadfl/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d9c825b4e2a58bbd9c7636d7eeb37a52f21d9c6;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'cr_fix' of https://github.com/hadfl/ipfire-2.x into next
---

9d9c825b4e2a58bbd9c7636d7eeb37a52f21d9c6