ss
hh

Merge branch 'master' of https://github.com/natydasilva/pkgmulti

Conflicts:
	qtest/R/trvar.R