# HG changeset patch
# User Asa Ayers <Asa.Ayers@Gmail.com>
# Date 1279610415 25200
# Node ID 508110e7c8eeadb5088eef689213dc175bcc9227
# Parent  aae189bf32ce6010c05b834af6ff440b57bfebe9# Parent  a66f6fc57cfb47c8cdc20f7953d4af1414c39225
Merged my fix for the changelog

diff -r a66f6fc57cfb -r 508110e7c8ee CHANGELOG.txt
--- a/CHANGELOG.txt	Tue Jul 20 00:09:54 2010 -0700
+++ b/CHANGELOG.txt	Tue Jul 20 00:20:15 2010 -0700
@@ -1,4 +1,4 @@
-2010-07-18  Asa Ayers  <Asa.Ayers@Gmail.com>
+2010-07-20  Asa Ayers  <Asa.Ayers@Gmail.com>
 
 - Implemented COD mail (Ticket #1) and updated the way postage was counted so that if you mail multiple items at once, they will all have the postage counted. I also removed the 30c for postage from how QA thresholds are calculated now that they will be counted every time.
 - Added a dialog to allow the user to send COD mail without a tracking number.