Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 27 Jun 2018 17:33:43 +0000 (19:33 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 27 Jun 2018 17:33:43 +0000 (19:33 +0200)
commit74c193f266e9660c822bfc5e86d050d35539bab6
treee9157671ef815196ae6f6bef47e55be243c5bf76
parent5776b677db10ad18aa9972b49900addaa8bf44ba
parentbc91a66281193d7fca60858e5efed5ec73ad9fe0
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next