tree 78ee102a32a72186e30b292808d3e626d9606225
parent ef4d6f50eb2fa044a231146f129313afe390c376
parent 05e2203a4e7f7ae5a664732ffe34410825d61834
author Christopher Tubbs <ctubbsii@apache.org> 1478298056 -0400
committer Christopher Tubbs <ctubbsii@apache.org> 1478298056 -0400

Merge branch '1.7' into 1.8

(No change in 1.8 branch)