From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 14 Oct 2013 02:27:01 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48ca3f361079330040b0162b1a2b074e78a327b8;p=dealii-svn.git

Merge from mainline.

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

48ca3f361079330040b0162b1a2b074e78a327b8