From: felix.gruber <felix.gruber@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 28 Nov 2013 15:17:04 +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=5757a72f617a4977342d7f211926c2e5cbed74e6;p=dealii-svn.git

Merge branch 'trunk' into branch_face_elements

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

5757a72f617a4977342d7f211926c2e5cbed74e6