[Python-modules-commits] [sphinxcontrib-spelling] 01/02: Merge upstream into master

[Stein Magnus Jodal]

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

jodal pushed a commit to branch master
in repository sphinxcontrib-spelling.

commit e61d438b383a12eaf598c0ec5b7c673e75fa3551
Merge: 6dcba0c cfb9b32
Author: Stein Magnus Jodal <jodal at debian.org>
Date:   Wed Nov 4 20:21:27 2015 +0100

    Merge upstream into master
    
    Due to rebasing a couple of commits too far back, I lost the previous
    merge commit and didn't notice until after I had pushed it.

 debian/.git-dpm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 672db8c,0000000..2ff79db
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- d19059c20c73b74db37968730faefc7cc56b4104
- d19059c20c73b74db37968730faefc7cc56b4104
- d19059c20c73b74db37968730faefc7cc56b4104
- d19059c20c73b74db37968730faefc7cc56b4104
- sphinxcontrib-spelling_2.1.1.orig.tar.gz
- 4d6df791ec8b5b0199c6d20ba812382b6a23ef3a
- 35353
++cfb9b3252f49b3205d039ab966d44daf13deb442
++cfb9b3252f49b3205d039ab966d44daf13deb442
++cfb9b3252f49b3205d039ab966d44daf13deb442
++cfb9b3252f49b3205d039ab966d44daf13deb442
++sphinxcontrib-spelling_2.1.2.orig.tar.gz
++af0990b395c4329552205fe123d1b75f3b648600
++35411
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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