hg merge binary, resolving one conflict by choosing left (new 0.17 version)
[awesomized/libmemcached] / AUTHORS
1 Brian Aker, brian@tangent.org -- Client Library, Tools
2 Mark Atwood, -- Tools
3 Patrick Galbraith, -- C++ Interface