Merge branch 'master' of https://github.com/nipy/nipype into nipy-master

Conflicts:
	nipype/interfaces/afni/preprocess.py

Author: sgiavasis

nipype/COMMIT_INFO.txt

@@ -1,6 +1,5 @@
-# This is an ini file that may contain information about the code state
 [commit hash]
-# The line below may contain a valid hash if it has been substituted during 'git archive'
-archive_subst_hash=$Format:%h$
-# This line may be modified by the install process
-install_hash=
+archive_subst_hash = $Format:%h$
+install_hash = 0a89257
+	
+

nipype/interfaces/afni/preprocess.py

@@ -196,8 +196,9 @@ class Refit(CommandLine):
     outputs = {}
 
     def _list_outputs(self):
-        self.outputs["out_file"] = os.path.abspath(self.inputs.in_file)
-        return self.outputs
+        outputs = self.output_spec().get()
+        outputs["out_file"] = os.path.abspath(self.inputs.in_file)
+        return outputs
 
 
 class WarpInputSpec(AFNICommandInputSpec):