From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 20 Nov 2012 23:26:46 +0000 (+0000)
Subject: merge from mainline
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51b4081fd12d90a33ce5c9ca1adc54b58b140153;p=dealii-svn.git

merge from mainline

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

51b4081fd12d90a33ce5c9ca1adc54b58b140153