Merge release-4-6 into release-5-0
authorRoland Schulz <roland@utk.edu>
Thu, 12 Feb 2015 10:10:31 +0000 (05:10 -0500)
committerRoland Schulz <roland@utk.edu>
Thu, 12 Feb 2015 10:10:31 +0000 (05:10 -0500)
commit6a96cf23d0ca3b46ed95555e052f261caed0bf8a
treed482ac6d3b2980d82c149cf7e003675b154e82ba
parent42bb5b30ffdf433642acdb0e36b87358e9965a51
parentc0602644070f1560be9a0661381eee54b59f3000
Merge release-4-6 into release-5-0

Conflicts:
src/gromacs/mdlib/pme.c (just copyright)

Change-Id: I419b260004806229c6eb9f993413b480041f20cc
src/gromacs/mdlib/pme.c