tree 2a40db5bfd291e547d1a4d7a50e73853da5043f8
parent 934f56335312da12cb21d66a16c6cf6e664c4a03
parent 323a43af0639883220227424e6aee474bfde55f7
author Eli Bendersky <eliben@gmail.com> 1349790443 -0700
committer Eli Bendersky <eliben@gmail.com> 1349790443 -0700
HG:rename-source hg

Merge 3.3

Issue #12322: clarify xpath reference for cases where the path reaches ancestors of the start element. Also add missing markup for a None. Thanks to patrick vrijlandt and Mike Hoy for the report and initial patches.