[Pkg-zsh-commits] [zsh] 01/02: 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 377fde7fc7770a3dc3d74a24302ad2aea9dadeab
Merge: 755a448 5dd4767
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Aug 30 12:45:27 2014 +0200

    Merge branch 'upstream' into debian

 ChangeLog         | 4 ++++
 Config/version.mk | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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