tree 1395bfb10902b7087a4ca1551f4bdb271b55ed43
parent e41b73caca2b543422f423a2ac07c29de834f44d
parent 2221f666eba4a6f46f2095a801bc3e4bdbdb97d2
author Larry Hastings <larry@hastings.org> 1395035645 -0700
committer Larry Hastings <larry@hastings.org> 1395035645 -0700

Merged default into 3.4 branch.  3.4 branch is now effectively 3.4.1rc1.