tree a73ba37e9f28d7121b1d08cb793d56552584a6de
parent 73be27022328eb60f719431fd70a63f1265cf473
parent c2373cede978a62eb3c142c5ca4bb1a02a32b3ad
author Mike Bayer <mike_mp@zzzcomputing.com> 1397411328 -0400
committer Mike Bayer <mike_mp@zzzcomputing.com> 1397411328 -0400

Merge branch 'master' into w_json_metadata

Conflicts:
	doc/build/changelog.rst