commit 15989e2d19a712af28c8e65e1781599a9853bedc
Merge: b3ee52f 7acf3e9
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Fri Mar 9 20:47:17 2012 +0100
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Fri Mar 9 20:47:17 2012 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
A jbehave-navigator/src/main/resources/images/arrow-blank.png
A jbehave-navigator/src/main/resources/images/arrow-down.png
A jbehave-navigator/src/main/resources/images/arrow-up.png
D jbehave-navigator/src/main/resources/images/orange-arrow-down.png
D jbehave-navigator/src/main/resources/images/orange-arrow-up.png
D jbehave-navigator/src/main/resources/js/angular-0.9.11.min.js
A jbehave-navigator/src/main/resources/js/angular-0.9.19.min.js
D jbehave-navigator/src/main/resources/js/jquery-1.5.1.min.js
A jbehave-navigator/src/main/resources/js/jquery-1.7.1.min.js
A jbehave-navigator/src/main/resources/js/jquery-ui-1.8.17.custom.min.js
M jbehave-navigator/src/main/resources/navigator.html
M distribution/src/site/content/release-notes.html
M jbehave-core/src/main/java/org/jbehave/core/steps/StepCandidate.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/CompositeStepCandidateBehaviour.java
M distribution/src/site/content/users-experiences.html
