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

[Alex Lehmann]

commit 3d22f279110d81003b70bacbdb9e0b1d30bd4de3
Merge: 465bf95 69055f2
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Sat Feb 25 15:57:53 2012 +0100
Commit:     Alex Lehmann <alexl...@gmail.com>
CommitDate: Sat Feb 25 15:57:53 2012 +0100

    Merge remote-tracking branch 'remotes/upstream/master'
    
    Conflicts:
        
jbehave-core/src/test/java/org/jbehave/core/model/ExamplesTableBehaviour.java

Changed files:

M       
jbehave-core/src/test/java/org/jbehave/core/model/ExamplesTableBehaviour.java
M       jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java