Merge branch 'master' of https://github.com/gumartinm/SpringWebServicesForFun
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Sat, 19 Dec 2015 15:18:04 +0000 (16:18 +0100)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Sat, 19 Dec 2015 15:18:04 +0000 (16:18 +0100)
commite05f0f250cc89a5816f702cf79ba59d20b3a02b6
tree8bb8272f076441a537bf6bdc1e998b4d1bc0116b
parent7980b7c1c65c0d0ed104168ebb63a576c63f70c4
parentd4b8f83adc3e2989560169cea9e7d203ca0c38fb
Merge branch 'master' of https://github.com/gumartinm/SpringWebServicesForFun

Conflicts:
cxf/web-services-spring-cxf-client/src/main/resources/log4j2.xml
jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml