Github user jeking3 commented on the pull request:
https://github.com/apache/thrift/pull/424#issuecomment-95177941
To make the (hopefully) impending merge easier, I merged master into this
branch and there was one conflict to resolve so I took care of it.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
