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