From: Michael Tremer Date: Tue, 21 Oct 2014 19:14:19 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen X-Git-Tag: v2.17-core87~103^2~50 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e41fbb6f0d47b0468f7c3ed2f7dbcae2d8bc9c4b Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen --- e41fbb6f0d47b0468f7c3ed2f7dbcae2d8bc9c4b