From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 11 Apr 2013 14:18:44 +0000 (+0000)
Subject: merge from mainline
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=030e6244c9b38714387908a3ff5c9687a868aac6;p=dealii-svn.git

merge from mainline

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

030e6244c9b38714387908a3ff5c9687a868aac6