[Python-modules-commits] [python-mongoengine] 02/13: merge patched into master

[Orestis Ioannou]

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

oorestisime-guest pushed a commit to branch master
in repository python-mongoengine.

commit 5bfac52d2181410feb63f0088156d95a7b018298
Merge: 15bba7e c34a3e5
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Wed Mar 9 00:56:00 2016 +0100

    merge patched into master

 debian/.git-dpm                                   |  4 ++--
 debian/patches/exclude-tests-from-packaging.patch | 25 -----------------------
 debian/patches/series                             |  1 -
 setup.py                                          |  2 +-
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --cc debian/.git-dpm
index 8f49327,0000000..cc91205
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
- 329469cd3643cb43d2873dbc88b6dba476403296
- 329469cd3643cb43d2873dbc88b6dba476403296
++c34a3e55152a2806fd287e77fd56d011144b2ac2
++c34a3e55152a2806fd287e77fd56d011144b2ac2
 +c34a3e55152a2806fd287e77fd56d011144b2ac2
 +c34a3e55152a2806fd287e77fd56d011144b2ac2
 +python-mongoengine_0.6.13.orig.tar.gz
 +0d44f8a4818f39cb752986c3109f2a3021bbb4fc
 +153261
 +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/python-mongoengine.git