From: Timo Heister <timo.heister@gmail.com>
Date: Wed, 1 May 2013 14:38:36 +0000 (+0000)
Subject: merge from mainline
X-Git-Tag: v8.0.0~120^2~69
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a54da70ca6525b2d2bc3fc6afd19aab8721827;p=dealii.git

merge from mainline

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

e3a54da70ca6525b2d2bc3fc6afd19aab8721827