Merge branch 'master' of ssh://github.com/google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Sun, 15 Jan 2017 21:01:04 +0000 (22:01 +0100)
committerRobert Swiecki <robert@swiecki.net>
Sun, 15 Jan 2017 21:01:04 +0000 (22:01 +0100)

Trivial merge