git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12807 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12808 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12809 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12810 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12811 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12812 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12813 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12814 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12815 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	src/USER-COLVARS/colvarproxy_lammps.h
Merge pull request #4 from lammps/lammps-icms

Merge from lammps-icms