Merge branch 'master' of ssh://github.com/google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Wed, 14 Jun 2017 00:15:19 +0000 (02:15 +0200)
committerRobert Swiecki <robert@swiecki.net>
Wed, 14 Jun 2017 00:15:19 +0000 (02:15 +0200)

Trivial merge