From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Wed, 21 Oct 2015 17:00:28 +0000 (+0200)
Subject: Merge branch 'release_preparings_v0.6'
X-Git-Tag: v0.7~12
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da0f602f2a3ec3ca608c2a891b73a9a42bc723a;p=candi.git

Merge branch 'release_preparings_v0.6'
---

5da0f602f2a3ec3ca608c2a891b73a9a42bc723a