From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Wed, 7 Aug 2013 09:04:39 +0000 (+0000)
Subject: Merge branch 'trunk' into branch_port_to_libcxx
X-Git-Tag: v8.1.0~1109^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d393ca641c2146e1a7d8f78405ba0c6a91589d8;p=dealii.git

Merge branch 'trunk' into branch_port_to_libcxx

Conflicts:
	deal.II/source/numerics/data_out.inst.in

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

6d393ca641c2146e1a7d8f78405ba0c6a91589d8