From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 19 Feb 2014 19:41:31 +0000 (+0000)
Subject: merge from mainline
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6134181db5b19e67163a9e4c3b7b96bacb3ccee5;p=dealii-svn.git

merge from mainline

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

6134181db5b19e67163a9e4c3b7b96bacb3ccee5