Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorHenrique Mendonça <henrique@apache.org>
Fri, 31 May 2013 21:54:56 +0000 (23:54 +0200)
committerHenrique Mendonça <henrique@apache.org>
Sat, 1 Jun 2013 09:31:51 +0000 (11:31 +0200)

Trivial merge