Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Tue, 14 Nov 2017 18:17:23 +0000 (19:17 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Tue, 14 Nov 2017 18:17:23 +0000 (19:17 +0100)
commit5776b677db10ad18aa9972b49900addaa8bf44ba
treeaed575c9f511b08259e318ad4f938fa5e2b83cf3
parent6600eeac49362964f6813c8c106aa68d6afe3d0e
parentf574f9ea02430521fafb9f28c3a42d31b68117bb
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next