| commit | 45d1c0083115b11dff4acbc76232633262f7b1a8 | [log] [tgz] |
|---|---|---|
| author | Larry Hastings <larry@hastings.org> | Tue Aug 25 14:21:59 2015 -0700 |
| committer | Larry Hastings <larry@hastings.org> | Tue Aug 25 14:21:59 2015 -0700 |
| tree | 263010dc1d82ddc2283fd61671c22da129a40974 | |
| parent | ccf426e7e77472b1ff1a919791aa3dd402836b83 [diff] | |
| parent | 06a7d611da25fab11b7a7ab7a7f0bbce7d6a65fd [diff] |
Merge from 3.5 (with 3.5.0rc2 changes) into default (3.6). Messy!