[cig-commits] [commit] master: Merge branch 'master' of github.com:geodynamics/aspect into nullspace (4700e2a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/2df080f4905a6be43fd1729ea0d6a7a956cce070...a7135c1f7697d39efff2f47a79ca1e1395cff504

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

commit 4700e2a05e256305fa2cd28e03043ae4e12f6277
Merge: 8cbea8f e1b62e6
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Wed May 21 13:45:38 2014 -0500

    Merge branch 'master' of github.com:geodynamics/aspect into nullspace



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

4700e2a05e256305fa2cd28e03043ae4e12f6277
 tests/composition_names.prm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)