Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorHenrique Mendonça <henrique@apache.org>
Fri, 20 Sep 2013 11:24:02 +0000 (13:24 +0200)
committerHenrique Mendonça <henrique@apache.org>
Fri, 20 Sep 2013 11:24:02 +0000 (13:24 +0200)

Trivial merge