Merge branch 'adam' into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 5 Jul 2012 10:19:09 +0000 (06:19 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Thu, 5 Jul 2012 10:19:09 +0000 (06:19 -0400)
Conflicts:
source/unres/src_MD/Makefile_MPICH_ifort


Trivial merge