[Chinese-commits] [manpages-zh] 104/131: Merge branch 'master' into debian

[Boyuan Yang]

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

hosiet-guest pushed a commit to branch master
in repository manpages-zh.

commit 47f652d560eb1240598edb0030e1127dcb393c78
Merge: 204dadf 496d105
Author: Boyuan Yang <073plan at gmail.com>
Date:   Sun Aug 7 21:41:52 2016 +0800

    Merge branch 'master' into debian
    
     Conflicts:
    	NEWS
    	README
    	src/man1/at.1
    	src/man1/tar.1
    	src/man7/ascii.7

 NEWS               |   3 +
 README             |   2 +
 src/cman/cman.conf | 114 +++++++
 src/cman/cman.csh  |   2 +
 src/cman/cman.sh   |   2 +
 src/man.macros     | 236 ++++++++++++++
 src/man1/..1       |   1 +
 src/man1/at.1      |   6 +-
 src/man1/tar.1     | 893 ++++++++++++++++++++++++++++++++++++++++-------------
 src/man2/socket.2  | 370 ++++++++++++++++++++++
 src/man7/ascii.7   | 233 ++++++++------
 11 files changed, 1552 insertions(+), 310 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/manpages-zh.git