modified:   ../../Makefile
	modified:   mpl_abs_cmp.man
	modified:   mpl_cmp.man
	modified:   man/man3/mpl_reduce_barrett.man
	modified:   man/man3/mpl_reduce_barrett_setup.man
	modified:   src/mpl_reduce.c
	modified:   man/man3/mpl_reduce_barrett.man
	modified:   man/man3/mpl_reduce_barrett_setup.man
	modified:   src/mpl_reduce.c
	modified:   man/man3/mpl_set_str.man
	modified:   man/man3/mpl_to_str.man
	modified:   Makefile
	modified:   include/mpl.h
	modified:   src/mpl_bitwise.c
	modified:   src/mpl_reduce.c
	modified:   ../Makefile
	modified:   Makefile
	modified:   include/mpl.h
	modified:   src/mpl_bitwise.c
	modified:   src/mpl_reduce.c
	modified:   src/mpl_set.c
	modified:   src/mpl_util.c
	modified:   src/mpl_reduce.c
	modified:   src/mpl_util.c
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
	include/mpl.h
	src/mpl_bitwise.c
	src/mpl_set.c
tratata