commit | 40e36b56a900bf66de4c9945ad1bed28b7e5706f | [log] [tgz] |
---|---|---|
author | Christopher Tubbs <ctubbsii@apache.org> | Thu May 28 14:17:13 2015 -0400 |
committer | Christopher Tubbs <ctubbsii@apache.org> | Thu May 28 14:17:13 2015 -0400 |
tree | e97a86c0d9f5ba51a5e0cfc9524d64d36801ba9e | |
parent | b10d7d52d86e9c5b461d93ab1a8aa8ac290908b4 [diff] | |
parent | 53459c86b6c5e84ccb18981bf56fc01948dfbff9 [diff] |
Merge branch '1.6' into 1.7 Conflicts: proxy/pom.xml