Merge branch 'master' of ssh://github.com/google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Sun, 25 Nov 2018 22:12:43 +0000 (23:12 +0100)
committerRobert Swiecki <robert@swiecki.net>
Sun, 25 Nov 2018 22:12:43 +0000 (23:12 +0100)

Trivial merge