[cig-commits] [commit] master: Merge branch 'benchmark_ownmaterialmodel2' into benchmark_ownmaterialmodel (efda087)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c883fc069e0dcc93cce45e1d52c84c05c9c4385b...1f4ab820b0191d9a4058b78c91b629bc94c437ec

>---------------------------------------------------------------

commit efda087740236653ad261b2f4f2e463394c114b2
Merge: 673f74a 1ca5a06
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 14:23:45 2014 -0400

    Merge branch 'benchmark_ownmaterialmodel2' into benchmark_ownmaterialmodel



>---------------------------------------------------------------

efda087740236653ad261b2f4f2e463394c114b2