[jbehave-scm] [scm-core][3/3] Merge branch 'master' of ssh://git.codehaus.org/jbehave-core

[Mauro Talevi]

commit c9d3b43ddac777ccf04dca70ec0854ffd349d23b
Merge: b6dd08b 73a6b06
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Fri, 21 Dec 2012 10:31:58 +0100
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Fri, 21 Dec 2012 10:31:58 +0100

    Merge branch 'master' of ssh://git.codehaus.org/jbehave-core
    
    Conflicts:
        
jbehave-core/src/test/java/org/jbehave/core/io/JarFileScannerBehaviour.java

Changed files:

M       
jbehave-core/src/test/java/org/jbehave/core/io/JarFileScannerBehaviour.java
M       jbehave-core/src/test/java/org/jbehave/core/io/StoryFinderBehaviour.java