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

Merge branch 'master' into deprecate_function_map
---

f9d7ab2c620da25e7e6b0989d2a1fbc4301a364a