[30/31] 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/e9c36d7a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e9c36d7a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e9c36d7a

Branch: refs/heads/LOG4J-1181
Commit: e9c36d7a3b10d4743c5e045a20792f552da303c3
Parents: a827f3f 242856c
Author: Mikael Ståldal <mik...@staldal.nu>
Authored: Sun Jun 12 13:42:59 2016 +0200
Committer: Mikael Ståldal <mik...@staldal.nu>
Committed: Sun Jun 12 13:42:59 2016 +0200

----------------------------------------------------------------------
 log4j-api/src/main/java/org/apache/logging/log4j/Logger.java | 8 +++++++-
 src/changes/changes.xml                                      | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------