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

[Alex Lehmann]

commit 5fcb3563bb8ea2ea20a738b0d6d20c676143cb30
Merge: 44e79da c3f8fc6
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Sat Dec 17 14:58:20 2011 +0100
Commit:     Alex Lehmann <alexl...@gmail.com>
CommitDate: Sat Dec 17 14:58:20 2011 +0100

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

Changed files:

M       jbehave-weld/pom.xml
M       settings.xml
M       jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java
M       
jbehave-core/src/test/java/org/jbehave/core/model/ExamplesTableBehaviour.java
M       
jbehave-core/src/main/java/org/jbehave/core/reporters/StoryReporterBuilder.java
M       jbehave-core/src/main/java/org/jbehave/core/steps/StepCreator.java
M       
jbehave-core/src/test/java/org/jbehave/core/steps/StepCandidateBehaviour.java