From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Nov 2014 10:38:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/seventeen' into seventeen
X-Git-Tag: v2.17-core87~103^2~16
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=f9921891f4dc3bc2f9be80d2871ce6f766a38e23

Merge remote-tracking branch 'origin/seventeen' into seventeen
---

f9921891f4dc3bc2f9be80d2871ce6f766a38e23