[2/2] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1986

[mikes]

Merge branch 'master' into LOG4J2-1986


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/db946ce7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/db946ce7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/db946ce7

Branch: refs/heads/LOG4J2-1986
Commit: db946ce77cce33e8d722d3b32d0bb91caeb0d17b
Parents: f1bb43c 8ca5826
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Sun Jul 23 21:55:25 2017 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Sun Jul 23 21:55:25 2017 +0200

----------------------------------------------------------------------
 src/site/xdoc/manual/layouts.xml.vm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------