From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Wed, 29 May 2013 23:08:52 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: v8.0.0~316^2~21
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60e75dad9851108f732c00dcdcaa72e196c1a06e;p=dealii.git

Merge from mainline.

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

60e75dad9851108f732c00dcdcaa72e196c1a06e