From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Tue, 3 Jan 2017 17:45:47 +0000 (-0700)
Subject: Merge pull request #3723 from masterleinad/update_memory_consumption
X-Git-Tag: v8.5.0-rc1~297
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c8245aaf4a570f4eb00889c50882e13a1d1ce1b;p=dealii.git

Merge pull request #3723 from masterleinad/update_memory_consumption

Update memory_consumption_01
---

6c8245aaf4a570f4eb00889c50882e13a1d1ce1b