* Merge from Debian unstable. Remaining Ubuntu changes: - Add "add-shell /bin/zsh" because zsh-beta is already registered as an alternative to zsh, and this is needed to be able to have zsh-beta as the only installed zsh. - Don't set PATH in zshenv any more - Update maintainer in field debian/control.