git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11114 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11115 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11116 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11117 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11118 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	doc/Manual.txt