From: felix.gruber <felix.gruber@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 6 Jan 2014 10:18:05 +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=0fba5de97e68a9a308ca2f279066cce4859512b7;p=dealii-svn.git

Merge branch 'trunk' into branch_face_elements

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

0fba5de97e68a9a308ca2f279066cce4859512b7