sympy/sympy — pull request #2293 by mattpap (2013-07-15 21:05:16+00:00)
Title: 0.7.3 merge

Fixed merge conflicts. Please check `sympy/__init__.py`, because I'm not sure if I did the right thing.