[Pkg-zsh-commits] [zsh] 02/06: Merge branch 'upstream' into debian

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit 8f07e7658dcdfecc082ddaaad8e26f460eb02d45
Merge: df234cd 56aa469
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Dec 2 15:39:20 2013 +0100

    Merge branch 'upstream' into debian

 .gitignore                                        |   4 +
 ChangeLog                                         | 149 +++++++-
 Completion/BSD/Command/_portaudit                 |   2 +-
 Completion/Unix/Command/.distfiles                |   1 +
 Completion/Unix/Command/_cdrdao                   |   2 +-
 Completion/Unix/Command/_df                       |  79 ++++
 Completion/Unix/Command/_git                      |  53 +--
 Completion/Unix/Command/_growisofs                |   4 +-
 Completion/Unix/Command/_systemd                  |   2 +-
 Completion/Zsh/Command/.distfiles                 |   1 +
 Completion/Zsh/Command/_run-help                  |   7 +
 Config/defs.mk.in                                 |   2 +
 Config/installfns.sh                              |  22 +-
 Config/version.mk                                 |   4 +-
 Doc/.cvsignore                                    |   1 +
 Doc/.distfiles                                    |   1 +
 Doc/Makefile.in                                   |  38 +-
 Doc/Zsh/contrib.yo                                |   6 +-
 Doc/Zsh/zle.yo                                    |  11 +-
 Doc/help/.cvsignore                               |   1 +
 Doc/help/.distfiles                               |   5 +
 Etc/ChangeLog-3.0                                 | 434 +++++++++++-----------
 Etc/ChangeLog-3.1                                 | 168 ++++-----
 Functions/Misc/run-help                           |   2 +-
 Functions/Misc/zcalc                              |  36 +-
 Functions/VCS_Info/Backends/VCS_INFO_get_data_git |   2 +-
 Functions/VCS_Info/VCS_INFO_reposub               |   4 +-
 LICENCE                                           |   2 +-
 Makefile.in                                       |  10 +-
 NEWS                                              |   5 +
 Src/Modules/clone.c                               |  10 +-
 Src/Modules/example.c                             |  10 +-
 Src/Zle/zle.h                                     |  12 +
 Src/Zle/zle_main.c                                |  62 ++--
 Src/Zle/zle_thingy.c                              |  52 ++-
 Src/Zle/zle_utils.c                               |   7 +-
 Src/math.c                                        |  34 +-
 Src/module.c                                      |  25 +-
 Src/subst.c                                       |   8 +
 Src/utils.c                                       |   6 +-
 Src/zsh.mdd                                       |   2 +-
 StartupFiles/zshrc                                |   2 +-
 Test/C01arith.ztst                                |  12 +-
 Test/D02glob.ztst                                 |   8 +
 Test/D04parameter.ztst                            |   9 +
 Util/helpfiles                                    |  88 ++++-
 configure.ac                                      |  20 +
 47 files changed, 952 insertions(+), 473 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git