From: Brian Aker <brian@tangent.org>
Date: Wed, 9 Jan 2008 18:11:23 +0000 (-0800)
Subject: Merge
X-Git-Tag: 0.13~5
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=635de3ca55245a58f49b487798476fbc96b5e364;p=awesomized%2Flibmemcached

Merge
---

635de3ca55245a58f49b487798476fbc96b5e364
diff --cc ChangeLog
index a17e370a,2de07f39..81ab5c1d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,6 @@@
++0.13
+   * Patch from Marc Rossi to add --hash option for memcp, memrm, and memcat.
 +  * Kevin's patch for fixing EOF issues during a read.
    * Toru Maesaka patch for stats mismatch
    * Fix for when CRC return 0
    * Fixed uint16_t issues around flags. Turns out the documentation on the