From: Michael Tremer Date: Mon, 3 Nov 2014 17:36:31 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/seventeen' into seventeen X-Git-Tag: v2.17-core87~103^2~32 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a5c99abe185bb8429149f4eadc1ce8244d3f6130 Merge remote-tracking branch 'origin/seventeen' into seventeen --- a5c99abe185bb8429149f4eadc1ce8244d3f6130