merge no conflicts

fb269171 · Razvan Pascanu · 586ce4b9 · 0f80b7d6 · fb269171 · fb269171
--- a/theano/scan_module/__init__.py
+++ b/theano/scan_module/__init__.py
--- a/theano/scan_module/scan_opt.py
+++ b/theano/scan_module/scan_opt.py