Check for CPimport.txt in devel tree.
Merge remote-tracking branch 'johansson/trunk' into trunk
Merge remote-tracking branch 'hart/trunk' into trunk

Conflicts:
	qadic/ctx_init_conway.c
Another attempt to get correct ARM/Thumb/Thumb2 assembly code.
Another attempt to get correct ARM/Thumb/Thumb2 assembly code.
Merge branch 'flint-2.4' into trunk
Fixed a corner case.
Merge remote-tracking branch 'hart/trunk' into trunk
Fix NTL interface tests. Reported by Francois Bissey.
Fix NTL interface tests. Reported by Francois Bissey.
Merge remote-tracking branch 'hart/trunk' into trunk
Fix test for empty string in install target.
modified link order for pthread
Fix old API usage in fq_nmod_poly/profile/p-factor_kaltofen_shoup_vs_fq_poly.c
Added profile code for fmpz_div_preinv.
Added BPSW todo.
added gram matrix function
Merge branch 'trunk' of git://github.com/wbhart/flint2 into trunk
changed documentation file
changed documentation file