From: turcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 16 Dec 2013 17:17:47 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98499f7e02374c31dba2ad6380ba7e4d5b159a5f;p=dealii-svn.git

Merge from mainline.

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

98499f7e02374c31dba2ad6380ba7e4d5b159a5f