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


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


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


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


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


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


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


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


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

Resolved Conflicts:
	doc/Manual.txt
fix bug in lj/sf reported by juerg diemand