From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 26 Oct 2012 20:13:24 +0000 (+0000)
Subject: merge from mainline
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2afb3e462a5f506e0dd717db0406321d1b7d0a3e;p=dealii-svn.git

merge from mainline

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

2afb3e462a5f506e0dd717db0406321d1b7d0a3e