[Python-modules-commits] [sortedcollections] 05/06: merge patched into master

[Diane Trout]

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

diane pushed a commit to branch master
in repository sortedcollections.

commit 4d112e29eb6b7eacef07e386cd0922b7ae4242c3
Merge: 4be6a46 688d199
Author: Diane Trout <diane at ghic.org>
Date:   Mon Apr 24 16:39:28 2017 -0700

    merge patched into master

 debian/.git-dpm | 2 +-
 docs/conf.py    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --cc debian/.git-dpm
index fcce2b7,0000000..5d1a75e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
 +821ba6fca37803dffd926f19f9aff6610f13ad6b
- 821ba6fca37803dffd926f19f9aff6610f13ad6b
++688d19949ccc3dd170a91680b8030c39a651240b
 +821ba6fca37803dffd926f19f9aff6610f13ad6b
 +821ba6fca37803dffd926f19f9aff6610f13ad6b
 +sortedcollections_0.5.3.orig.tar.gz
 +0597c2fd4cf158c42b1dade64340358931f87a46
 +112468

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sortedcollections.git