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

[Alex Lehmann]

commit 0ee604957105abb57a88bd66aa5ac8ee574a1919
Merge: 07af4be 47e49de
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Sat Jan 21 12:42:37 2012 +0100
Commit:     Alex Lehmann <alexl...@gmail.com>
CommitDate: Sat Jan 21 12:42:37 2012 +0100

    Merge remote-tracking branch 'remotes/upstream/master'

Changed files:

A       
jbehave-core/src/main/java/org/jbehave/core/steps/PatternVariantBuilder.java
M       jbehave-core/src/main/java/org/jbehave/core/steps/Steps.java
A       
jbehave-core/src/test/java/org/jbehave/core/steps/PatternVariantBuilderBehaviour.java
M       jbehave-core/src/main/resources/ftl/jbehave-report-decorated.ftl