From e24bf338e56a0d8ccfd8bfd101572c49325941f1 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Sat, 20 Jun 2009 18:31:01 +0000
Subject: [PATCH] Consolodating changes by two people.

---
 docs/CHANGES.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 176ae36ef..36bf48d83 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2009.June.13 (0.9.21)
+2009.June.20 (0.9.21)
   * New Starters:
     -------------
     * Silver Frame
@@ -108,9 +108,6 @@ $Id$
       "lpr", but that command is not available) should appear in Tux Paint.
       (SourceForge bug #2205528)
 
-    * Further adjustments to postscript_print scaling.
-      Thomas Kalka <thomas.kalka@googlemail.com>
-
   * Build System Improvements:
     --------------------------
     * Adhering to Debian & FreeDesktop.org standards regarding .desktop file.
@@ -281,6 +278,7 @@ $Id$
       canvas printed small, compared to when they're printed at the size
       they were drawn.
       Pere Pujal i Carabantes <pere@fornol.no-ip.org>
+      Thomas Kalka <thomas.kalka@googlemail.com>
 
     * Corrected 'oval' brush shape so that colors came out right.
       (Thanks to Andrei Skoogarev)