From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 14 May 2014 19:30:50 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.15-core79~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fde3230a88f633ec6358959626ca90c1ae3e1a3;p=ipfire-2.x.git

Merge branch 'master' into next
---

6fde3230a88f633ec6358959626ca90c1ae3e1a3