| commit | 17abc4d79d475e873f577903d0b0fe63fdb36511 | [log] [tgz] |
|---|---|---|
| author | Christopher Tubbs <ctubbsii@apache.org> | Wed Feb 03 16:56:14 2016 -0500 |
| committer | Christopher Tubbs <ctubbsii@apache.org> | Wed Feb 03 16:56:14 2016 -0500 |
| tree | 90b1fb1f8581e5544d603fbcdd7d9fdcb7decf16 | |
| parent | 7562ec897503a66bd694c8efc74963c46c218aff [diff] | |
| parent | ce73a57e04b7aebf9d929c797b6e6e14c44e7f36 [diff] |
Merge branch '1.7' Conflicts: maven-plugin/src/it/plugin-test/pom.xml