tree 17b056260e139ceae55b5cbeef50ba11e8284771
parent 45cf452dbb4d8ed367a968a3f3ee4f3ef30ca9e4
parent 21c68864a9f5458e5a7ecb29a6498b503ea3312b
author Martin Polreich <polreichmartin@gmail.com> 1533543149 +0200
committer Martin Polreich <polreichmartin@gmail.com> 1533543149 +0200

Merge branch 'master' of github.com:salt-formulas/salt-formula-linux

Change-Id: I5468d69c362cbd2e71a064bd2bc89f843fbefe7e