[jbehave-scm] [scm-core][53] Merge remote-tracking branch 'remotes/upstream/master'

[Alex Lehmann]

commit 22759bde5dbd566c6ce8ff392ac7b62fdceb494f
Merge: e1492fd 5cd5b4d
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Thu Dec 22 19:42:08 2011 +0100
Commit:     Alex Lehmann <alexl...@gmail.com>
CommitDate: Thu Dec 22 19:42:08 2011 +0100

    Merge remote-tracking branch 'remotes/upstream/master'
    
    Conflicts:
        
jbehave-core/src/main/java/org/jbehave/core/steps/PendingStepMethodGenerator.java

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
M       jbehave-core/src/main/java/org/jbehave/core/steps/StepCreator.java
M       
jbehave-core/src/test/java/org/jbehave/core/reporters/StackTraceFormatterBehaviour.java
M       
jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java
M       
jbehave-core/src/test/java/org/jbehave/core/steps/StepCreatorBehaviour.java