@SPancratz
SPancratz Merge branch 'trunk' of https://github.com/wbhart/flint2 into trunk
69395ab Aug 22, 2015
Merge branch 'trunk' of https://github.com/wbhart/flint2 into trunk 
Conflicts:
	padic_poly.h
	qadic.h
69395ab