jenkins merging release branch into master (strategy: theirs) 4.8.0
authorjenkins <jenkins-int@bgbm.org>
Thu, 6 Jul 2017 15:52:42 +0000 (17:52 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 6 Jul 2017 15:52:42 +0000 (17:52 +0200)
commite3449a9ebbfcce3986bbcaf900533890b50d60f9
treec334f60c9bfabdd62c41e7ebf8a577ff29cad1b3
parent485bae1ed1009ce202efa8cb00b83225f418360b
parentc07758005cbe06a29d9d8cdc15455aaf9db78f02
jenkins merging release branch into master (strategy: theirs)