Merge branch 'master' into fsl_randomise

* master: (79 commits)
  fix: update to use abspath for out_file
  fix: allow file to be copied for workflow operation (don't allow inputs to be modified)
  fix: add imports to init
  fix: missing test file
  DOC: Added matlab_wrap example that allows for more control and access to MAtlabCommand inputs and outputs
  TEST: added tests for spm utils reslice
  TEST: added tests for spm utils apply_transform
  TEST: added spm util coreg tests
  enh: simple spm_reslice interface
  added catch if spm not found
  ENH: interface to use spm_coreg to calc transform
  enh: set up basic interface
  sty: embed emacs and vim setting in file
  Renamed README so Github can parse reStructuredText format
  fix: epidewarp.fsl
  Fix fixed download link ;)
  Fixed download link
  Release 0.5.3
  Doc: added example to epidewwarp.fsl
  FIX: switched epidewarp to fsl interface
  ...

Author: bpinsard

.gitattributes

@@ -0,0 +1 @@
+nipype/COMMIT_INFO.txt export-subst

.gitignore

@@ -6,5 +6,9 @@
 /nipype/nipype.egg-info
 /doc/_build
 /doc/users/examples
+/doc/api/generated
 *.pyc
 *.so
+.project
+.settings
+.pydevproject

.project

@@ -1,7 +1,18 @@
-Changes since 0.5
-=================
+Release 0.5.3 (Mar 23, 2012)
+============================
+
+* FIX: SPM model generation when output units is in scans
+
+Release 0.5.2 (Mar 14, 2012)
+============================
+
+* API: Node now allows specifying node level configuration for SGE/PBS clusters
+* API: Logging to file is disabled by default
+* API: New location of log file -> .nipype/nipype.cfg
+
+* ENH: Changing logging options via config works for distributed processing
 
-None
+* FIX: Unittests on debian (logging and ipython)
 
 Release 0.5 (Mar 10, 2012)
 ==========================

.pydevproject

@@ -7,6 +7,7 @@ include Makefile
 include build_docs.py
 include setup_egg.py
 include doc/documentation.zip
+include nipype/COMMIT_INFO.txt
 
 recursive-include doc *
 recursive-include matlabscripts *

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1 @@
+/documentation.zip

CHANGES

@@ -17,7 +17,7 @@ <h3>{{ _('Versions') }}</h3>
                 <td align="left">Release</td><td align="right">Devel</td>
             </tr>
             <tr>
-                <td align="left">0.5-1203</td><td align="right">pre-0.6</td>
+                <td align="left">0.5.3</td><td align="right">pre-0.6</td>
             </tr>
             <tr>
                 <td align="left"><a href="{{pathto('users/install')}}">Download</a></td>