Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Fri, 21 Dec 2012 22:08:22 +0000 (23:08 +0100)
committerJens Geyer <jensg@apache.org>
Fri, 21 Dec 2012 22:08:22 +0000 (23:08 +0100)
commitd0c3586e499fad2e7a30ffb08d3de901a5bb008c
tree8d90d141c61f430b3ed0f738cf1f5077acd4cd76
parentc880b44c5d81ade7ceb897fd55af94c0a8e5b31a
parent38f955ef7ea4764c19fca185725a8f84f414abba
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift