Merge branch 'merge' of git://github.com/mdomsch/s3cmd
Removed trailing whitespace after merge.
Generate a note into s3cmd.1 about auto-generated manpage
Version 1.5.0-beta1
include python version in error dump
remove python-2.5-ism when guessing mimetype (bug #218)

This syntax doesn't work on python 2.4, which we still support.
encode filenames to system encoding before calling shutils.copy2()

shutils.copy2() eventually calls os.stat(), which fails if given a
unicode object.  So, encode the filename before the call to copy2(),
using the default file system encoding.
getting the file system encoding is loop invariant

so move it out of the loop.
Merge pull request #250 from mdomsch/bug/python-version-on-error

include python version in error dump
Merge pull request #251 from mdomsch/bug/218

remove python-2.5-ism when guessing mimetype (bug #218)
Merge pull request #253 from mdomsch/bug/unicode-stat

encode filenames to system encoding before calling shutils.copy2()
Print a useful error message when MemoryError is raised
Fix a spelling mistake (conect => connect)
Merge pull request #259 from 36degrees/patch-1

Fix a spelling mistake (conect => connect)
fix divide-by-zero when no files were transferred

Repored by Jason Woodall to s3tools-bugs 2014-01-06.
handle OSError: No such file or directory in get_local_filelist

reported to s3tools-bugs by John R. Moser 2013-01-09.
Merge branch 'bug/memoryerror' into merge
Merge branch 'bug/divide-by-zero' into merge
Merge branch 'bug/lstat-removed-file' into merge