[devscripts] 03/10: Merge branch 'master' into multitar

[Osamu Aoki]

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

osamu pushed a commit to branch multitar
in repository devscripts.

commit 2a5d113bfd1d74fe47da2963b5988b36ee7ee95c
Merge: a08e48c f7ac0ef
Author: Osamu Aoki <osamu at debian.org>
Date:   Wed Oct 7 22:51:07 2015 +0900

    Merge branch 'master' into multitar
    
    Conflicts resolved:
    	debian/changelog

 scripts/dd-list.1    |   8 ++-
 scripts/dd-list.pl   |  87 +++++++++++++++++++++++-----
 test/dd-list/sources | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++
 test/test_dd-list    |  18 +++++-
 4 files changed, 252 insertions(+), 18 deletions(-)

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