commit 1e70b23ae660d7990afdcebff76d0bc38a9fa74a
Merge: 36fd740 85bbd59
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Fri Jan 13 13:41:24 2012 +0100
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Fri Jan 13 13:41:24 2012 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
M archetypes/jbehave-groovy-archetype/pom.xml
M archetypes/jbehave-guice-archetype/pom.xml
M archetypes/jbehave-pico-archetype/pom.xml
M archetypes/jbehave-simple-archetype/pom.xml
M archetypes/jbehave-spring-archetype/pom.xml
M archetypes/pom.xml
M distribution/pom.xml
M jbehave-ant/pom.xml
M jbehave-core/pom.xml
M jbehave-google/pom.xml
M jbehave-groovy/pom.xml
M jbehave-guice/pom.xml
M jbehave-hudson-plugin/pom.xml
M jbehave-jenkins-plugin/pom.xml
M jbehave-maven-plugin/pom.xml
M jbehave-navigator/pom.xml
M jbehave-odf/pom.xml
M jbehave-pico/pom.xml
M jbehave-scala/pom.xml
M jbehave-spring/pom.xml
M jbehave-weld/pom.xml
M pom.xml
D test.txt
M README.md
A test.txt
