Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorhenrique <henrique@apache.org>
Tue, 5 Nov 2013 14:01:48 +0000 (15:01 +0100)
committerhenrique <henrique@apache.org>
Tue, 5 Nov 2013 14:01:48 +0000 (15:01 +0100)

Trivial merge