[Commits] [Carpet] branch, master, updated. carpet-6-init-408-g8359eda

[Carpet git repositories]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>".

The branch, master has been updated
       via  8359eda5b4f02eb5d7ffae2abb0518e653a56fd2 (commit)
       via  965a83725ca6fb26c60daaaa56d5bdfc04ce678d (commit)
       via  7b4fac2f0c1b44fc7f6934d0edff186aaf6fd7e7 (commit)
      from  d6949619a2957892b071d973d14a1a71bbd25f1d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8359eda5b4f02eb5d7ffae2abb0518e653a56fd2
Merge: d694961 965a837
Author: Erik Schnetter <schnetter at gmail.com>
Date:   Fri Dec 6 10:10:13 2013 -0500

    Merge branch 'apply-after-release'
    
    Conflicts:
    	Carpet/CarpetLib/src/dh.cc
    
    Note: The changes to dh.cc regarding restriction are not included in this merge.

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
--
Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>