tree bf3c0f3a33170702254c8ca24fb156e6730f3a28
parent 65d83ecf3e5350e6194a38de2a201f4ea8665ff3
parent 8538edfee709db3eac7b9f85afce899299a23965
author Jens Geyer <jensg@apache.org> 1355681092 +0100
committer Jens Geyer <jensg@apache.org> 1355681092 +0100

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift