Merge branch 'master' of https://github.com/google/flatbuffers
authorWouter van Oortmerssen <aardappel@gmail.com>
Wed, 18 Jan 2017 22:58:09 +0000 (14:58 -0800)
committerWouter van Oortmerssen <aardappel@gmail.com>
Wed, 18 Jan 2017 22:58:09 +0000 (14:58 -0800)

Trivial merge