merging master branch before pushing changes to step control

63da679e · Sidafa Conde · de00cead · 63da679e · 63da679e · 63da679e
Commit 63da679e authored Sep 22, 2015 by Sidafa Conde
--- a/.gitdist.default
+++ b/.gitdist.default
--- a/.gitignore
+++ b/.gitignore
--- a/.mailmap
+++ b/.mailmap
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
--- a/Copyright.txt
+++ b/Copyright.txt
--- a/INSTALL
+++ b/INSTALL
--- a/LICENSE
+++ b/LICENSE
--- a/PackagesList.cmake
+++ b/PackagesList.cmake
--- a/ProjectName.cmake
+++ b/ProjectName.cmake
--- a/README
+++ b/README
--- a/README.md
+++ b/README.md
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
--- a/SIERRA/Fixes.log
+++ b/SIERRA/Fixes.log
--- a/SIERRA/bjam/README
+++ b/SIERRA/bjam/README
--- a/SIERRA/bjam/TrilinosSierraConfig.h
+++ b/SIERRA/bjam/TrilinosSierraConfig.h
--- a/SIERRA/bjam/config_headers/Amesos2_config.h
+++ b/SIERRA/bjam/config_headers/Amesos2_config.h
--- a/SIERRA/bjam/config_headers/Amesos2_config_fcs.h
+++ b/SIERRA/bjam/config_headers/Amesos2_config_fcs.h
--- a/SIERRA/bjam/config_headers/Amesos_config.h
+++ b/SIERRA/bjam/config_headers/Amesos_config.h
--- a/SIERRA/bjam/config_headers/Amesos_config_fcs.h
+++ b/SIERRA/bjam/config_headers/Amesos_config_fcs.h