[Python-modules-commits] [pylibmc] 03/18: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository pylibmc.

commit c88beedda7b1e1a520d23bc59dc1316503f8545f
Merge: 415f7d4 d0a5328
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Apr 1 21:31:57 2016 +0200

    merge patched into master

 LICENSE                           |  27 ++
 PKG-INFO                          |  18 +-
 README.rst                        |  16 +-
 debian/.git-dpm                   |   6 +-
 debian/patches/series             |   1 -
 debian/patches/sphinx-theme.patch |  63 -----
 docs/behaviors.rst                |  11 +-
 docs/changelog.rst                |  10 +-
 docs/coders.rst                   |  11 +
 docs/reference.rst                |  33 ++-
 setup.py                          |   2 +-
 src/_pylibmcmodule.c              | 567 +++++++++++++++++++++++++++-----------
 src/_pylibmcmodule.h              |  30 +-
 src/pylibmc-version.h             |   2 +-
 tests/__init__.py                 |  14 +-
 tests/test_refcounts.py           | 178 ++++++++++++
 tests/test_serialization.py       | 223 +++++++++++++++
 17 files changed, 963 insertions(+), 249 deletions(-)

diff --cc debian/.git-dpm
index 5f8903f,0000000..a35c7ec
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
- 4d5d342456ee22cab3fa905fe089401434da790e
- 4d5d342456ee22cab3fa905fe089401434da790e
- 35f9837004003babedb791c6bb7c351181b36797
++d0a53287b0569ae242ee13f312f542270878c1f6
++d0a53287b0569ae242ee13f312f542270878c1f6
++d0a53287b0569ae242ee13f312f542270878c1f6
 +d0a53287b0569ae242ee13f312f542270878c1f6
 +pylibmc_1.5.1.orig.tar.gz
 +e2eb370fe560da13967918b41969101ef35b526e
 +59726
 +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/pylibmc.git