[jbehave-scm] [scm-core][19] Merge branch 'master' of git://github.com/jbehave/jbehave-core

[Alex]

commit 1d1b89baa6882e2b73395f0d9f455482f19c23e5
Merge: be3f40c 5db9769
Author:     Alex <alexl...@gmail.com>
AuthorDate: Thu Jul 26 23:48:32 2012 +0200
Commit:     Alex <alexl...@gmail.com>
CommitDate: Thu Jul 26 23:48:32 2012 +0200

    Merge branch 'master' of git://github.com/jbehave/jbehave-core

Changed files:

M       jbehave-core/src/main/resources/ftl/jbehave-html-output.ftl
M       jbehave-core/src/main/resources/ftl/jbehave-xml-output.ftl
M       
jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java
M       jbehave-core/src/test/resources/story.html
M       jbehave-core/src/test/resources/story.xml