Merge branch 'master' of https://github.com/google/flatbuffers
authorWouter van Oortmerssen <wvo@google.com>
Wed, 10 Feb 2016 21:51:10 +0000 (13:51 -0800)
committerWouter van Oortmerssen <wvo@google.com>
Wed, 10 Feb 2016 21:51:10 +0000 (13:51 -0800)

Trivial merge