Merge branch 'blis/ops14todo' of https://github.com/Microsoft/CNTK into blis/ops14todo

contrib/Python/cntk/ops/__init__.py

@@ -487,9 +487,9 @@ def cond(flag, value_if_true, value_if_false, name=None):
     Behaves analogously to numpy.where(...).
 
     Example:
-    >>> C.eval(C.cond([-10, -1, 0, 0.3, 100], [1, 10, 100, 1000, 10000], [ 2, 20, 200, 2000, 20000]))
-    [array([[  1.00000000e+00,   1.00000000e+01,   2.00000000e+02,
-               1.00000000e+03,   1.00000000e+04]])]
+        >>> C.eval(C.cond([-10, -1, 0, 0.3, 100], [1, 10, 100, 1000, 10000], [ 2, 20, 200, 2000, 20000]))
+        [array([[  1.00000000e+00,   1.00000000e+01,   2.00000000e+02,
+                   1.00000000e+03,   1.00000000e+04]])]
 
     Args:
         flag: tensor