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

merge from mainline

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

df352fc9be509eae6f0edbdea34e1fac4948d930