sage

ae63b520 - src/sage/arith/misc.py (factor): Fix bad merge; docstring cosmetics