Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Aug 2018 08:32:21 +0000 (10:32 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Aug 2018 08:32:21 +0000 (10:32 +0200)
commit7fe5bc8261d639753ee7a5a005ce06325231769b
treede32166b728f7e92a01c54db47a00ac9d9eef05d
parentf7d76eecc6660bd2d59951a6aa138cd0f96a2e9d
parent702f0ba8357aa11ccee4cf7c43efd5d8f362a343
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next