Merge branch 'lj_cubic_error' of github.com:olavgal/lammps into collected-small-changes

src/EXTRA-PAIR/pair_lj_cubic.cpp

@@ -241,6 +241,8 @@ double PairLJCubic::init_one(int i, int j)
   lj2[j][i] = lj2[i][j];
   lj3[j][i] = lj3[i][j];
   lj4[j][i] = lj4[i][j];
+  epsilon[j][i] = epsilon[i][j];
+  sigma[j][i] = sigma[i][j];
 
   return cut[i][j];
 }