From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 27 Oct 2013 12:12:12 +0000 (+0100)
Subject: Merge branch 'next' into fifteen
X-Git-Tag: v2.15-beta1~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47a83092b5a6f2fa13d1c95de75b7bea4eb90da2;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' into fifteen
---

47a83092b5a6f2fa13d1c95de75b7bea4eb90da2