relax SVN archive

Reverted r20620 as the checked out trunk copy was not up to date.

The command used was:
svn merge -r20620:r20619 .

.....
r20620 | bugman | 2013-08-16 20:15:58 +0200 (Fri, 16 Aug 2013) | 3 lines
Changed paths:
M /trunk

Initialized merge tracking via "svnmerge" with revisions "1-20577" from
svn+ssh://bugman@.../svn/relax/branches/peak_intensities
.....

Initialized merge tracking via "svnmerge" with revisions "1-20577" from
svn+ssh://bugman@.../svn/relax/branches/peak_intensities

Fixes for a few GUI tests for the spectrum.read_intensities user function argument changes.

Fixes for a few system tests for the spectrum.read_intensities user function argument changes.

Unit test fixes for the spectrum.read_intensities user function argument changes.

The NMRPipe seriesTab peak lists are now supported through the Peak_list object.

The Peak_list object can now store peak intensity names.

This is for peak lists such as from NMRPipe seriersTab files where the peak list covers multiple
spectra.

Removal of a now unused list variable.

Fixes for the pipe_control.spectrum.read() function.

An error was referencing a now non-existent variable and the docstring has been fixed.

The lib.spectrum.peak_list.intensity_generic() function now operates on the Peak_list object.