Imported Upstream version 2013.06.21
Merge tag 'upstream/2013.06.21'

Upstream version 2013.06.21

Conflicts:
	.gitignore
Update changelog.

Git-Dch: Ignore
debian/install: Remove, as we let setup.py install things.

With this change, we stop installing zipped files prepended by a Python
shebang line.

Closes: #699043
debian/rules: Simplify rules file with use of buildsystem.

We take advantage of the buildsystem=python_distutils and no other changes
are needed.
debian/control: Remove B-D on pandoc.
debian/control: Remove B-D-I on perl.
debian/control: Remove obsolete DMUA flag.
Update changelog.

Git-Dch: Ignore