diff CHANGELOG.txt @ 3:5635080385bd tip

Merge patch with 1.x-dev
author Franck Deroche <franck@defr.org>
date Fri, 07 Aug 2009 15:20:12 +0200
parents b0a976e17cc7
children
line wrap: on
line diff
--- a/CHANGELOG.txt	Thu Aug 06 19:09:42 2009 +0200
+++ b/CHANGELOG.txt	Fri Aug 07 15:20:12 2009 +0200
@@ -1,4 +1,4 @@
-// $Id: CHANGELOG.txt,v 1.15 2009/05/17 11:27:42 karens Exp $
+// $Id: CHANGELOG.txt,v 1.17 2009/06/12 16:38:30 karens Exp $
 
 Version 6.1-dev
 =================