Merge remote-tracking branch 'remotes/origin/pr/97'
authorMichael Prokop <mika@grml.org>
Fri, 25 May 2018 11:02:05 +0000 (13:02 +0200)
committerMichael Prokop <mika@grml.org>
Fri, 25 May 2018 11:02:05 +0000 (13:02 +0200)
commitc63778958572b529958e6d2844352bc6c4739ea5
tree7b840c30e8d8eb223a591d348552e257d44d13ce
parent891308e330c361d7d6185e0d412b47b41c49f453
parent7f3e2b0f970864652ee51d595512eaf022dac80d
Merge remote-tracking branch 'remotes/origin/pr/97'