From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 25 Feb 2013 12:52:47 +0000 (+0000)
Subject: Merge from Mainline
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4586513e87eec506b87b7d1dfb58aad71dc196a0;p=dealii-svn.git

Merge from Mainline

Conflicts:
	deal.II/common/Make.global_options.in
	deal.II/examples/step-42/Makefile

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

4586513e87eec506b87b7d1dfb58aad71dc196a0