Merged revisions 8519 via svnmerge from

mdboom · mdboom · commit 6d7712991563 · 2010-07-06T15:32:32.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8519 | mdboom | 2010-07-06 11:31:53 -0400 (Tue, 06 Jul 2010) | 1 line Testing merging (removing bogus content) ........ svn path=/trunk/matplotlib/; revision=8520
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,3 @@
-2010-07-06 Testing merging
-
 2010-07-06 Tagging for mpl 1.0 at r8502
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-2010-07-06 Testing merging`
`2`		`-`
`3`	`1`	`2010-07-06 Tagging for mpl 1.0 at r8502`
`4`	`2`
`5`	`3`