Github user flandr commented on the pull request:
https://github.com/apache/thrift/pull/271#issuecomment-66313618
Sounds good; fixed merge conflicts and ran `make style` for conformance.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
