nothing relevant
Merge remote-tracking branch 'origin/master'

Conflicts:
	.Rhistory
	.Rproj.user/3D666299/pcs/windowlayoutstate.pper
	.Rproj.user/3D666299/pcs/workbench-pane.pper
	.Rproj.user/3D666299/persistent-state
	.Rproj.user/3D666299/sdb/per/t/6ED8B10F
	.Rproj.user/3D666299/sdb/prop/INDEX
	.Rproj.user/424D5858/sdb/per/t/3A060E12
	.Rproj.user/424D5858/sdb/s-852EF725/2E0AE583
	R/netstats.R
	src/net.dll
	src/sstat.f90
	src/sstat.o