From: Timo Heister <timo.heister@gmail.com>
Date: Thu, 6 Feb 2014 20:46:14 +0000 (+0000)
Subject: merge from mainline
X-Git-Tag: v8.2.0-rc1~771^2~16
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f67ed8bdbaa9190acdbbfb857695afa410f6df5e;p=dealii.git

merge from mainline

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

f67ed8bdbaa9190acdbbfb857695afa410f6df5e