[Pkg-zsh-commits] [zsh] 03/05: 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 b3541722e8b02bf0340edebbece40c08544fad4e
Merge: dbd1863 2bab9f0
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Nov 26 21:46:14 2015 +0100

    Merge branch 'upstream' into debian
    
    This is necessary to include the most recent fix for the testsuite.
    Otherwise the package FTBFS.

 ChangeLog                       | 11 +++++++++++
 Completion/Unix/Command/_sysctl | 14 +++++++-------
 Test/B02typeset.ztst            |  2 +-
 Test/V10private.ztst            | 11 ++++++++++-
 4 files changed, 29 insertions(+), 9 deletions(-)

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