Merge pull request #612 from lamblin/merge_feature_rebased

Merge feature (rebased)

Merge pull request #612 from lamblin/merge_feature_rebased
d4dfbf2a · nouiz · a96d5716 · c42d1808 · d4dfbf2a · d4dfbf2a
--- a/theano/compile/mode.py
+++ b/theano/compile/mode.py
--- a/theano/gof/opt.py
+++ b/theano/gof/opt.py
--- a/theano/tensor/opt.py
+++ b/theano/tensor/opt.py
@@ -1823,7 +1823,6 @@ def local_subtensor_merge(node):
                    merged_slices.append(slice1)
                pos_1 += 1
            if pos_2 < len(slices2):
                merged_slices += slices2[pos_2:]
            else: