commit 3ab8cb9abfbf4a1df4dd6b5f934ef4b7e843331f
Merge: 31bf5eb c3de11f
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Mon Feb 27 21:08:06 2012 +0100
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Mon Feb 27 21:08:06 2012 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
M
examples/spring-security/src/test/java/com/learnthinkcode/example/jbehave/AbstractSpringJBehaveIntegrationTest.java
M examples/pom.xml
M
jbehave-hudson-plugin/src/main/resources/org/jbehave/hudson/jbehave-3.x-to-junit-1.0.xsl
M
jbehave-hudson-plugin/src/test/java/org/jbehave/hudson/ReportTransformBehaviour.java
A jbehave-hudson-plugin/src/test/resources/title.story
M
jbehave-jenkins-plugin/src/main/resources/org/jbehave/jenkins/jbehave-3.x-to-junit-1.0.xsl
M
jbehave-jenkins-plugin/src/test/java/org/jbehave/jenkins/ReportTransformBehaviour.java
A jbehave-jenkins-plugin/src/test/resources/title.story
M
examples/trader/src/main/java/org/jbehave/examples/trader/stories/parametrised_table.story
