From: Michael Tremer Date: Tue, 4 Nov 2014 22:52:28 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/seventeen' into seventeen X-Git-Tag: v2.17-core87~103^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07686bd7e27e790af69f6c3ad7c5f24298ab4c21;p=ipfire-2.x.git Merge remote-tracking branch 'origin/seventeen' into seventeen --- 07686bd7e27e790af69f6c3ad7c5f24298ab4c21