Merge pull request #405 from lamblin/buildbot_warning

theano/misc/do_nightly_build

@@ -25,8 +25,8 @@ fi
 
 echo "Number of elements in the compiledir:"
 ls ${COMPILEDIR}|wc -l
-# We don't want warnings in the buildbod for errors already fixed.
-FLAGS=${THEANO_FLAGS},warn.argmax_pushdown_bug=False,warn.gpusum_01_011_0111_bug=False,warn.sum_sum_bug=False,warn.sum_div_dimshuffle_bug=False,$FLAGS
+# We don't want warnings in the buildbot for errors already fixed.
+FLAGS=${THEANO_FLAGS},warn.argmax_pushdown_bug=False,warn.gpusum_01_011_0111_bug=False,warn.sum_sum_bug=False,warn.sum_div_dimshuffle_bug=False,warn.subtensor_merge_bug=False,$FLAGS
 # We want to see correctly optimization/shape errors, so make make them raise an
 # error.
 FLAGS=on_opt_error=raise,$FLAGS