tree ac6dc8660d30277989c265d43a0e0d76a4e47905
parent b7982786c43a8fb3c8393e4bd9042e6b8011ee2e
parent 48f6901632f00b99fa38b344a939189159d1d101
author Dominik Psenner <dpsenner@apache.org> 1526831303 +0200
committer Dominik Psenner <dpsenner@apache.org> 1526831303 +0200

Merge branch 'develop' into feature/RollingFileAppender-NG