From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Thu, 1 Nov 2012 02:49:05 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: v8.0.0~1079^2~368
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4c16bbe680b7924c77a1a542aadbc6b330baed1;p=dealii.git

Merge from mainline.

git-svn-id: https://svn.dealii.org/branches/branch_cmake@27284 0785d39b-7218-0410-832d-ea1e28bc413d
---

a4c16bbe680b7924c77a1a542aadbc6b330baed1