[Python-modules-commits] [python-tmdbsimple] 03/06: 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 python-tmdbsimple.

commit 3b17ae49edd4199a8f0e9a018f46031671757968
Merge: c96816c 86530dc
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Jul 17 10:02:30 2017 +0200

    merge patched into master

 debian/.git-dpm        |  6 +++---
 setup.py               |  4 ++--
 tests/test_movies.py   |  2 +-
 tests/test_tv.py       | 11 +++++++++++
 tmdbsimple/__init__.py |  2 +-
 tmdbsimple/movies.py   |  2 +-
 tmdbsimple/tv.py       | 38 +++++++++++++++++++++++++++++++++++++-
 7 files changed, 56 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 3154320,0000000..fe200f1
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
- 8d246a456fcfeb0cb83d16c701cec452adad1979
- 8d246a456fcfeb0cb83d16c701cec452adad1979
- 8d246a456fcfeb0cb83d16c701cec452adad1979
++86530dcbcfd7f38f97af4c14ce2849dce3a796d2
++86530dcbcfd7f38f97af4c14ce2849dce3a796d2
++86530dcbcfd7f38f97af4c14ce2849dce3a796d2
 +86530dcbcfd7f38f97af4c14ce2849dce3a796d2
 +python-tmdbsimple_1.7.0.orig.tar.gz
 +cdc4575c78526eba03287a92b546fc54b89ceedf
 +30144

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