Merging Pauli's autoreload branch.
Merging Pauli's autoreload branch.

Original branch location:
  https://code.launchpad.net/~pauli-virtanen/ipython/ipython-autoreload

The branch is now marked as merged and should be closed.

ipython/ipython,ipython/ipython