Merge branch 'trunk' of https://github.com/benoitdion/thrift into trunk

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1326086 13f79535-47bb-0310-9956-ffa450edef68
17 files changed