tree 27fcddcdbfce1a488e862771475f9e029c8e028f
parent cccc4349fc889fc27886918af8e06c9413b0deac
parent a47b4afc5b40c1b4aaa0278f21d3cb3666a2280d
author Edwin Kempin <ekempin@google.com> 1471594302 +0200
committer Edwin Kempin <ekempin@google.com> 1471594373 +0200

Merge branch 'stable-2.11'

* stable-2.11:
  Add correct license for asciidoctor

Change-Id: Ib2f7625c5fc28e8c6cb45effc5e290ea45750442