[2/2] cxf-fediz git commit: Fixing merge

Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/90431dbb Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/90431dbb Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/90431dbb Branch:

[2/2] cxf-fediz git commit: Fixing merge

Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d71f3286 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d71f3286 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d71f3286 Branch:

[2/2] cxf-fediz git commit: Fixing merge

Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/f4d00969 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/f4d00969 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/f4d00969 Branch:

[2/2] cxf-fediz git commit: Fixing merge

Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/5a225d15 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5a225d15 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5a225d15 Branch: