Merge.

1d58f01f · Pierre-Antoine Manzagol · 9747f659 · 08e47ed9 · 1d58f01f
--- a/theano/tensor/basic.py
+++ b/theano/tensor/basic.py
@@ -1423,7 +1423,7 @@ def neg(a):

 @_scal_elemwise
 def inv(a):
-    """1.0/a (inplace on a)"""
+    """1.0/a"""

 @_scal_elemwise
 def log(a):