tree 20165d3bbed05237a0e9997646d460bc54983000
parent 68600aff3a841c1d901758c0e4e3fb3aafc7354e
parent 11f3f172e7081e2de0879dff86ded51109fa4e04
author Chris Jerdonek <chris.jerdonek@gmail.com> 1351969602 -0700
committer Chris Jerdonek <chris.jerdonek@gmail.com> 1351969602 -0700

Merge from 3.2: link to mapping glossary entry in docs.