Merge branch 'master' of ssh://github.com/google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Sat, 24 Nov 2018 16:22:13 +0000 (17:22 +0100)
committerRobert Swiecki <robert@swiecki.net>
Sat, 24 Nov 2018 16:22:13 +0000 (17:22 +0100)

Trivial merge