tree a6186c6273cfe4c995e5b9ab5d64bef5ba8647e0
parent 713623bee6105f6b8ee946cecde4dd98847f6a2b
author Kevin Clark <kclark@apache.org> 1226682699 +0000
committer Kevin Clark <kclark@apache.org> 1226682699 +0000

Merge branch 'THRIFT-143'


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@714070 13f79535-47bb-0310-9956-ffa450edef68