Merge branch 'master' of ssh://github.com/google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Thu, 14 Sep 2017 19:17:57 +0000 (21:17 +0200)
committerRobert Swiecki <robert@swiecki.net>
Thu, 14 Sep 2017 19:17:57 +0000 (21:17 +0200)

Trivial merge