From: Michael F. Herbst <info@michael-herbst.com>
Date: Mon, 23 Feb 2015 14:28:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v8.3.0-rc1~431^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=867cd5c220269e7f2c56afd85218d72733160624;p=dealii.git

Merge remote-tracking branch 'upstream/master'
---

867cd5c220269e7f2c56afd85218d72733160624