From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Thu, 14 Jun 2018 21:14:12 +0000 (+0200)
Subject: Merge branch 'master' into fix#6756
X-Git-Tag: v9.1.0-rc1~1039^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6757%2Fhead;p=dealii.git

Merge branch 'master' into fix#6756
---

fa0256ea447580c06de21b5ac17358a2e84a4308