Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Conflicts:
distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d3944d6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d3944d6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d3944d6
Branch: refs/heads/master
Commit: 7d3944d6ecc09f01271658bb876c02e7b51e6f58
Parents: 8fd8c55 a2e1e40
Author: reta <drr...@gmail.com>
Authored: Thu Jan 15 21:18:04 2015 -0500
Committer: reta <drr...@gmail.com>
Committed: Thu Jan 15 21:18:04 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
