From: Timo Heister <timo.heister@gmail.com>
Date: Fri, 31 May 2013 17:47:51 +0000 (+0000)
Subject: merge from mainline
X-Git-Tag: v8.0.0~120^2~52
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11f38b345a6bda5ade953578d44f68f87330a27f;p=dealii.git

merge from mainline

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

11f38b345a6bda5ade953578d44f68f87330a27f