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

[Alex Lehmann]

commit 0fb0b39cae107fef662c820988578b4422d3ec08
Merge: 1e99707 991b54c
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Mon Jul 30 21:00:09 2012 +0200
Commit:     Alex Lehmann <alexl...@gmail.com>
CommitDate: Mon Jul 30 21:00:09 2012 +0200

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

Changed files:

M       jbehave-core/src/test/resources/story.html
M       jbehave-core/src/test/resources/story.xml
M       
jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java
M       jbehave-core/pom.xml
M       jbehave-core/src/main/resources/ftl/jbehave-html-output.ftl
M       jbehave-core/src/main/resources/ftl/jbehave-xml-output.ftl
A       
jbehave-core/src/main/java/org/jbehave/core/reporters/XmlTemplateOuput.java
M       jbehave-core/src/main/java/org/jbehave/core/reporters/Format.java
D       
jbehave-core/src/main/java/org/jbehave/core/reporters/XmlTemplateOuput.java
A       
jbehave-core/src/main/java/org/jbehave/core/reporters/XmlTemplateOutput.java