Merge branch 'master' into enh/versioning

satra · satra · commit b77f3b441302 · 2012-12-09T14:43:29.000-05:00
* master:
  fix: doctest carriage return
diff --git a/nipype/interfaces/base.py b/nipype/interfaces/base.py
@@ -1356,8 +1356,7 @@ class MpiCommandLine(CommandLine):
     
     >>> mpi_cli.inputs.use_mpi = True
     >>> mpi_cli.inputs.n_procs = 8
-    >>> mpi_cli.cmdline
-    
+    >>> mpi_cli.cmdline    
     'mpiexec -n 8 my_mpi_prog -v'
     '''
     input_spec = MpiCommandLineInputSpec
