commit d7a00c3e6deeeca3fe3975215777f08b1a10f81b Merge: 69645ce 3bf2921 Author: Alex Lehmann <alexl...@gmail.com> AuthorDate: Sat Jan 21 17:37:10 2012 +0100 Commit: Alex Lehmann <alexl...@gmail.com> CommitDate: Sat Jan 21 17:37:10 2012 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
M
jbehave-core/src/main/java/org/jbehave/core/steps/PendingStepMethodGenerator.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/PendingStepMethodGeneratorBehaviour.java
