Merge branch 'master' of github.com:google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Mon, 29 May 2017 16:02:58 +0000 (18:02 +0200)
committerRobert Swiecki <robert@swiecki.net>
Mon, 29 May 2017 16:02:58 +0000 (18:02 +0200)

Trivial merge