From: Timo Heister <timo.heister@gmail.com>
Date: Wed, 19 Feb 2014 19:41:31 +0000 (+0000)
Subject: merge from mainline
X-Git-Tag: v8.2.0-rc1~771^2~10
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbf4b938cfbd51ffc2ddb35efda14a26f36ffc5b;p=dealii.git

merge from mainline

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

dbf4b938cfbd51ffc2ddb35efda14a26f36ffc5b