uProxy/libfte — pull request #17 by kpdyer (2014-06-26 18:20:49+00:00)
Title: Issue #10: resolving conflict from merge

I broke the build when merging my various pull requests.