Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorRoger Meier <roger@apache.org>
Wed, 16 Jul 2014 18:16:22 +0000 (20:16 +0200)
committerRoger Meier <roger@apache.org>
Wed, 16 Jul 2014 18:16:22 +0000 (20:16 +0200)
commit3148f21c8e8a78b565bd281645b8faacef6eb858
tree88cdb8b051f82186c08c3adc22d02750c267a2d5
parentc437cff08f0013aa832d2efa871539f5d2a04891
parent8a2bab3f72e85b8ba6c96d63ab4df708ec211ac0
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift