From: felix.gruber <felix.gruber@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 22 Nov 2013 10:10:38 +0000 (+0000)
Subject: Merge branch 'trunk' into branch_face_elements
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=819bf6a873e3545fb3fbfc14a690f378ca273e12;p=dealii-svn.git

Merge branch 'trunk' into branch_face_elements

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

819bf6a873e3545fb3fbfc14a690f378ca273e12