Merge branch 'adam' into devel
authorAdam Liwo <jal47@matrix.chem.cornell.edu>
Wed, 17 Oct 2012 04:52:06 +0000 (00:52 -0400)
committerAdam Liwo <jal47@matrix.chem.cornell.edu>
Wed, 17 Oct 2012 04:52:06 +0000 (00:52 -0400)
Conflicts:
bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe


Trivial merge