From: Timo Heister <timo.heister@gmail.com>
Date: Sat, 1 Jun 2013 00:50:37 +0000 (+0000)
Subject: merge from mainline
X-Git-Tag: v8.0.0~120^2~50
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=473a3f9fcc2ff6e5db4872c92663408609ae09b1;p=dealii.git

merge from mainline

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

473a3f9fcc2ff6e5db4872c92663408609ae09b1