Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorRoger Meier <roger@apache.org>
Wed, 16 Jul 2014 18:16:22 +0000 (20:16 +0200)
committerRoger Meier <roger@apache.org>
Wed, 16 Jul 2014 18:16:22 +0000 (20:16 +0200)

Trivial merge