Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Thu, 12 Feb 2015 18:38:31 +0000 (13:38 -0500)
committerRoland Schulz <roland@utk.edu>
Thu, 12 Feb 2015 18:38:51 +0000 (13:38 -0500)
Change-Id: I23579c289b8a057a94cf64b142759934b9402ee5

1  2 
src/gromacs/ewald/pme.c
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu

Simple merge