Merge branch 'master' of https://github.com/google/flatbuffers
authorWouter van Oortmerssen <wvo@google.com>
Mon, 21 Dec 2015 22:43:48 +0000 (14:43 -0800)
committerWouter van Oortmerssen <wvo@google.com>
Mon, 21 Dec 2015 22:43:48 +0000 (14:43 -0800)

Trivial merge