git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12028 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12029 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12030 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12031 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12032 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12033 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12034 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12035 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms