Merging this fix that somehow never got brought over (from r2385, r2388, and r2390)

git-svn-id: http://svn6.assembla.com/svn/pyfits/branches/3.1-stable@2581 ed100bfc-0583-0410-97f2-c26b58777a21
Merge

git-svn-id: http://svn6.assembla.com/svn/pyfits/branches/3.1-stable@2584 ed100bfc-0583-0410-97f2-c26b58777a21
Remove changelog entry that was invalid and update 3.0.13 release date

git-svn-id: http://svn6.assembla.com/svn/pyfits/branches/3.1-stable@2589 ed100bfc-0583-0410-97f2-c26b58777a21
Preparing release 3.1.4

git-svn-id: http://svn6.assembla.com/svn/pyfits/branches/3.1-stable@2590 ed100bfc-0583-0410-97f2-c26b58777a21
Back to development: 3.1.5

git-svn-id: http://svn6.assembla.com/svn/pyfits/branches/3.1-stable@2592 ed100bfc-0583-0410-97f2-c26b58777a21
Update .authors file after SVN move off of Assembla


Conflicts:

	.authors

git-svn-id: http://svn6.assembla.com/svn/pyfits/branches/3.1-stable@2617 ed100bfc-0583-0410-97f2-c26b58777a21