From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 3 May 2013 22:00:46 +0000 (+0000)
Subject: merge from mainline
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f18e0c08fe78fe8d7562ed1dc0e8ed1a39305e0a;p=dealii-svn.git

merge from mainline

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

f18e0c08fe78fe8d7562ed1dc0e8ed1a39305e0a