| commit | cc565f93e292eb2d71108190bb373cb04ce2873f | [log] [tgz] |
|---|---|---|
| author | Christopher Tubbs <ctubbsii@apache.org> | Tue Dec 22 18:35:11 2015 -0500 |
| committer | Christopher Tubbs <ctubbsii@apache.org> | Tue Dec 22 18:35:11 2015 -0500 |
| tree | 443e4c554313648df085e3e5441dd2d4d3f4cff0 | |
| parent | b636853db6ace8fd025d2134772d135ac7fb9e87 [diff] | |
| parent | 7711356fab9b4838f35e193a8d6ad160d455f80d [diff] |
Merge branch '1.6' into 1.7 * This preserves the existing configuration and formatting in the 1.7 branch (equivalent to merging with -sours)