From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Thu, 17 Oct 2013 17:48:20 +0000 (+0000)
Subject: Merge trunk into branch_port_the_testsuite
X-Git-Tag: v8.1.0~570^2~29
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f6ecca4d9856d643449cda322685a3add1299d7;p=dealii.git

Merge trunk into branch_port_the_testsuite

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

3f6ecca4d9856d643449cda322685a3add1299d7