Merge branch 'feature3418' of https://github.com/sptm/matplotlib into… · matplotlib/matplotlib@f723408 · GitHub

Commit

Merge branch 'feature3418' of https://github.com/sptm/matplotlib into…

Browse files

… feature3418

Conflicts:
	lib/matplotlib/tests/baseline_images/test_text/fonttext_wrap.png
	lib/matplotlib/tests/test_text.py

Loading branch information

sptm committed Apr 20, 2015

2 parents 208ae10 + ce88717 commit f723408