tree 54f5840189e6d9409c4b6049d73ee655ee03cad3
parent 92a90ff8cf2716cd06e8696c24746635544d2685
author Roger Meier <roger@apache.org> 1334401401 +0000
committer Roger Meier <roger@apache.org> 1334401401 +0000

Merge branch 'trunk' of https://github.com/benoitdion/thrift into trunk

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