tree ad1821a19f6391c8455b244a1bc90000e4ee61dc
parent 77575e69bbb9a8bc4b7d392abec781150c4cb039
author Christopher Piro <cpiro@apache.org> 1191283504 +0000
committer Christopher Piro <cpiro@apache.org> 1191283504 +0000

Merge branch 'otp'


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