Merge branch 'master' into doc-config55/head
commit0cd09f33fcaeb134fdcfe3732daed04a737d29b9
authorStefan Kögl <stefan@skoegl.net>
Sun, 6 Aug 2017 16:32:30 +0000 (6 18:32 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sun, 6 Aug 2017 16:32:30 +0000 (6 18:32 +0200)
tree5ecc14979873489bf8c3d3628cfc1acc5919c10e
parent17d66a527f38e888b59b6d3181e3e6867a36cee0
parenta34979bbdb1a8cf54cb4cde5d1715d835113971c
Merge branch 'master' into doc-config