From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 6 Jun 2013 19:44:17 +0000 (+0000)
Subject: merge from mainline
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=134bbc8c6e203396420f240fea238b3fcd1704af;p=dealii-svn.git

merge from mainline

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

134bbc8c6e203396420f240fea238b3fcd1704af