From: Timo Heister <timo.heister@gmail.com>
Date: Sun, 2 Jun 2013 15:46:27 +0000 (+0000)
Subject: merge from mainline
X-Git-Tag: v8.0.0~120^2~49
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b352ba553a8725648f3f52880f4e928f3818fa84;p=dealii.git

merge from mainline

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

b352ba553a8725648f3f52880f4e928f3818fa84