Repository: struts
Updated Branches:
refs/heads/support-2-3 a39879317 -> 10a612c9d
WW-4589 do not overwrite explicit method name
Conflicts:
plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit
Repository: struts
Updated Branches:
refs/heads/master 3163d6c38 -> 1fb695a82
WW-4589 do not overwrite explicit method name
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1fb695a8
Tree: http://git-wip-us.apache.org/repo
