Merge branch 'master' of ssh://github.com/google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Fri, 20 Oct 2017 12:44:07 +0000 (14:44 +0200)
committerRobert Swiecki <robert@swiecki.net>
Fri, 20 Oct 2017 12:44:07 +0000 (14:44 +0200)

Trivial merge