Re-merged r1075684 using svn tools. Please don't do merges by hand. This will introdu...
authorAndreas Veithen <veithen@apache.org>
Thu, 3 Mar 2011 22:30:37 +0000 (22:30 +0000)
committerAndreas Veithen <veithen@apache.org>
Thu, 3 Mar 2011 22:30:37 +0000 (22:30 +0000)
commite894c5a1ece302a878cad14c5c2a58d18f127ca4
tree4778eec2388b1b9bd0ac3bc7a38101ae970d9049
parent11e790b891f8be152dcfe759c9f4f11a2d6bddd7
Re-merged r1075684 using svn tools. Please don't do merges by hand. This will introduce tiny differences that cause merge conflicts later.
modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml