From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Thu, 2 Feb 2017 10:55:04 +0000 (+0100)
Subject: Merge pull request #3894 from kronbichler/fix_constraints_merge
X-Git-Tag: v8.5.0-rc1~168
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=977793196afae26757dc6fcc66dfa734ee892c86;p=dealii.git

Merge pull request #3894 from kronbichler/fix_constraints_merge

Fix constraints merge
---

977793196afae26757dc6fcc66dfa734ee892c86