Remove code that was inadvertently merged from branch.
scatterpoints support in Legend. patch by Erik Tollerud
fixed a zoom bug in sharex axis
Fix mathtext (bug has existed since r6400 11/12/2008)
point to the right url for the rc file
Remove conflict markers from CHANGELOG.
[ 2314869 ] Log base-2 axes fail with certain axis limits
fixed a small bug in fill_between
fixed datalim update for fill_between
