Merge branch 'master' of ssh://github.com/google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Sun, 8 Oct 2017 10:57:51 +0000 (12:57 +0200)
committerRobert Swiecki <robert@swiecki.net>
Sun, 8 Oct 2017 10:57:51 +0000 (12:57 +0200)

Trivial merge