fix a Makefile
Merge branch 'master' of github.com:Macaulay2/M2

Conflicts:
	M2/libraries/pari/Makefile.in
update INSTALL for Scientific Linux
Merge branch 'master' of github.com:DanGrayson/M2

Conflicts:
	M2/BUILD/dan/Makefile.scientific
	M2/INSTALL
my makefile
Merge branch 'master' of github.com:Macaulay2/M2
update change-log
update NormalToricVarieties.m2

new file provided by Greg Smith
Merge branch 'master' of github.com:Macaulay2/M2
Added Divisor.m2 for consideration in Macaulay2
Merge remote-tracking branch 'upstream/pull/159'

Conflicts:
	M2/Macaulay2/packages/=distributed-packages
add new package Divisor to the list of changes
max_align_t problem

 ... in Mac OS X, where 'cstddef' is loaded before 'stddef.h' while
 loading gmp.h when using c++

Conflicts:
	M2/BUILD/dan/Makefile.mac
max_align_t problem, part 2
fix a test for frobby

incorrect syntax for unix "test" program, == for =
update 4ti2 patches to get tests to run
Merge branch 'master' of github.com:DanGrayson/M2
Merge branch 'master' of github.com:Macaulay2/M2
Merge branch 'master' into linalg

Conflicts:
	M2/BUILD/dan/Makefile.mac
	M2/Macaulay2/packages/Macaulay2Doc/changes.m2
fix makefile so adding a new package for distribution triggers reconfiguration