en cours

Conflicts: theano/tensor/tests/test_basic.py

en cours
ac8cb3fe · Melanie Ducoffe · b42e6020 · ac8cb3fe
--- a/theano/tensor/tests/test_basic.py
+++ b/theano/tensor/tests/test_basic.py