Merge release-4-6 into release-5-0
authorRoland Schulz <roland@utk.edu>
Sun, 29 Jun 2014 07:32:16 +0000 (03:32 -0400)
committerRoland Schulz <roland@utk.edu>
Sun, 29 Jun 2014 07:33:03 +0000 (03:33 -0400)
commit46afc2960825a4dd45176ba86101cafe720e5564
treebd9400a0d8a1f5723c8bfcb8b1b8b0106eef327d
parent7ba0a841df25e54d36586e31003fbfe93bd2588d
parent5886961ef51ad9e57164945a77d0072576d81eae
Merge release-4-6 into release-5-0

Change-Id: I89230f8a117d9636570e573b7b2657c79aea51c0
src/external/thread_mpi/include/thread_mpi/atomic.h
src/gromacs/gmxana/gmx_current.c