[7/8] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-1395

[mikes]

Merge branch 'master' into LOG4J2-1395


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

Branch: refs/heads/LOG4J2-1395
Commit: a8d466da02f1d2f36210ff787ed0b8ea1e64eec7
Parents: 7a06cd9 86095e9
Author: Mikael Ståldal <mikael.stal...@magine.com>
Authored: Tue Jun 14 09:47:52 2016 +0200
Committer: Mikael Ståldal <mikael.stal...@magine.com>
Committed: Tue Jun 14 09:47:52 2016 +0200

----------------------------------------------------------------------
 log4j-bom/pom.xml              |  4 ++--
 pom.xml                        | 36 +++++++++++++++++++++++++-----------
 src/site/xdoc/manual/async.xml |  4 ++--
 3 files changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------