Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorhenrique <henrique@apache.org>
Fri, 30 Aug 2013 20:04:52 +0000 (22:04 +0200)
committerhenrique <henrique@apache.org>
Fri, 30 Aug 2013 20:04:52 +0000 (22:04 +0200)

Trivial merge