Github user PSUdaemon commented on the pull request:
https://github.com/apache/trafficserver/pull/160#issuecomment-112916955
Tried to commit and there was a merge conflict. Can you rebase onto master?
---
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.
---
