From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Wed, 7 Oct 2015 07:42:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/allow_overwriting_vars' into release_preparings_v0.6
X-Git-Tag: v0.7~12^2~6
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97178aeb07e7336bbd686db722248bf322c7f125;p=candi.git

Merge remote-tracking branch 'origin/allow_overwriting_vars' into release_preparings_v0.6
---

97178aeb07e7336bbd686db722248bf322c7f125