| commit | 3ea1c8be50b8f4054890fd55f2e8c719ce7827ba | [log] [tgz] |
|---|---|---|
| author | Christopher Tubbs <ctubbsii@apache.org> | Tue Jun 09 20:11:41 2015 -0400 |
| committer | Christopher Tubbs <ctubbsii@apache.org> | Tue Jun 09 20:11:41 2015 -0400 |
| tree | ba27e9df427481e30a1db4ac89e20295dcdf7e2d | |
| parent | 4cbb072ca3a42f00cf590fc36fb1500208ff8fee [diff] | |
| parent | b595a84ce65b5b1b2111568b9d7b4826021d4e23 [diff] |
Merge branch '1.6' into 1.7 Conflicts: maven-plugin/pom.xml pom.xml