Merge branch 'master' into ansible-fixup
authornicoo <nicoo@realraum.at>
Fri, 17 Nov 2017 13:15:08 +0000 (14:15 +0100)
committernicoo <nicoo@realraum.at>
Fri, 17 Nov 2017 13:15:08 +0000 (14:15 +0100)
commit605383e1bfc115b3133b105565593d565a9f740d
treee0c1dd8bbe21ab8ce62f999402fb8f8ca859b03a
parent77527f38e49197966b59f7c3897a5aa9afe7669e
parenta73b796383168aba8a021d2adf0a147d3501c9e8
Merge branch 'master' into ansible-fixup