commit 535a475295bde881f61934d7bfd7f3a532e15d93
author Edwin Kempin <ekempin@google.com> Fri Aug 19 10:29:42 2016 +0200
committer Edwin Kempin <ekempin@google.com> Fri Aug 19 10:29:55 2016 +0200
tree ffdbb73401eb1bbfacbef246b4bb129b5dfa96b2
parent 453e4aeceba9a9a093c3a40de90b6fd99b5b2068
parent 2b230c6cb8230d2d29dbe1df3c39ce9d9ee306ef

Merge branch 'stable-2.12'

* stable-2.12:
  Add a test for Asciidoctor document titles / sections
  Add correct license for asciidoctor
  Make the basicTextFormattingWorks() test more strict
  Add tests to check that empty input renders to empty output
  AsciidoctorFormatterTest: Fix order of expected and actual results
  AsciidoctorFormatterTest: Do not pass baseDir to AsciidoctorFormatter()
  AsciidoctorFormatter: Simplify code by using the Asciidoctor >= 1.5 API
  Upgrade asciidoctor and its jruby dependency
  Add a unit test for the AsciidoctorFormatter
  Upgrade asciidoctor and its jruby dependency
  MarkdownFormatterTest: Fix order of expected and actual results
  MarkdownFormatterTest: Make a few member variables local ones
  xdocs: Add a unit test for the MarkdownFormatter

Change-Id: I99578f15906a3fa7a75d9ea500d502f1948b8720