Merge branch 'master' into piecewise_fixes

Conflicts: sympy/functions/elementary/piecewise.py sympy/printing/tests/test_str.py
flacjacket · Mar 21, 2012 · b2bc48b · b2bc48b
2 parents 256094c + de84ed2
commit b2bc48b
Show file tree

Hide file tree

Showing 78 changed files with 3,029 additions and 2,548 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -191,3 +191,6 @@ Carsten Knoll <CarstenKnoll@gmx.de>
 M R Bharath <catchmrbharath@gmail.com>
 Matthias Toews <mat.toews@googlemail.com>
 Jorge E. Cardona <jorgeecardona@gmail.com>
+Sanket Agarwal <sanket@sanketagarwal.com>
+Manoj Babu K. <manoj.babu2378@gmail.com>
+Sai Nikhil <tsnlegend@gmail.com>