[Python-modules-commits] [django-recurrence] 03/09: 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 django-recurrence.

commit 16bcbb55653b61735a8ef9da0f3bdd9cf9e8ab98
Merge: 60ef0f2 961b7a8
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Oct 17 09:50:18 2016 +0200

    merge patched into master

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 ...se-Python-3-compatible-exception-handling.patch |  22 -
 debian/patches/0002-Fixes-for-Django-1.10.patch    |  53 ---
 debian/patches/series                              |   2 -
 django_recurrence.egg-info/PKG-INFO                |   2 +-
 django_recurrence.egg-info/SOURCES.txt             |   5 +
 docs/changelog.rst                                 |  11 +
 docs/conf.py                                       |   4 +-
 recurrence/base.py                                 |  24 +-
 recurrence/locale/eu/LC_MESSAGES/django.mo         | Bin 0 -> 4161 bytes
 recurrence/locale/eu/LC_MESSAGES/django.po         | 374 +++++++++++++++
 recurrence/locale/eu/LC_MESSAGES/djangojs.mo       | Bin 0 -> 5187 bytes
 recurrence/locale/eu/LC_MESSAGES/djangojs.po       | 499 +++++++++++++++++++++
 setup.py                                           |   2 +-
 15 files changed, 909 insertions(+), 97 deletions(-)

diff --cc debian/.git-dpm
index df4c1b0,0000000..d8c8ffb
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
- f185a5e8c0a3ad7cfaf5f956d1aafc1c94aa8de1
- f185a5e8c0a3ad7cfaf5f956d1aafc1c94aa8de1
- 9701c091ddfd818b6a42e2b4dbdb4c3b28497833
++961b7a8474a9f6fd2864d96287b334d4950bccaf
++961b7a8474a9f6fd2864d96287b334d4950bccaf
++961b7a8474a9f6fd2864d96287b334d4950bccaf
 +961b7a8474a9f6fd2864d96287b334d4950bccaf
 +django-recurrence_1.4.0.orig.tar.gz
 +ed5b43ac06154977ffda0841f57350213fb38987
 +90175

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