From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 3 Oct 2013 23:31:02 +0000 (+0000)
Subject: Merge trunk into branch_port_the_testsuite
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356047b149335522aa9a3e140d85686a1a4a5617;p=dealii-svn.git

Merge trunk into branch_port_the_testsuite

Conflicts:
	tests/deal.II/grid_tools_05.output
	tests/deal.II/grid_tools_05/cmp/generic

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

356047b149335522aa9a3e140d85686a1a4a5617