[3/3] logging-log4j2 git commit: Merge branch 'master' into LOG4J-1181

[mikes]

Merge branch 'master' into LOG4J-1181


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

Branch: refs/heads/LOG4J-1181
Commit: cb6226b9d61d9d080955ba51393243b2bfb2484f
Parents: 7c57300 021da77
Author: Mikael Ståldal <mikael.stal...@magine.com>
Authored: Mon Jun 13 11:26:27 2016 +0200
Committer: Mikael Ståldal <mikael.stal...@magine.com>
Committed: Mon Jun 13 11:26:27 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/logging/log4j/spi/AbstractLogger.java   | 4 ++--
 .../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------