From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Oct 2013 12:13:39 +0000 (+0200)
Subject: Merge branch 'next' into fifteen
X-Git-Tag: v2.15-beta1~193^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b7f6aa4d9d0f6c17d668620000c4496eb96e34c;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' into fifteen
---

0b7f6aa4d9d0f6c17d668620000c4496eb96e34c