Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorRoger Meier <roger@apache.org>
Tue, 27 May 2014 21:57:38 +0000 (23:57 +0200)
committerRoger Meier <roger@apache.org>
Tue, 27 May 2014 21:57:38 +0000 (23:57 +0200)

Trivial merge