[Python-modules-commits] [python-markdown] 03/06: merge patched into master

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository python-markdown.

commit c64a830d5f06074aaebcee50591ab0dcb2156cce
Merge: b92e78a cbeb43e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Nov 26 18:58:52 2015 +0300

    merge patched into master

 PKG-INFO                                           |  4 ++--
 debian/.git-dpm                                    |  6 +++---
 ...ng-of-characters-after-backtick-in-tables.patch | 23 ----------------------
 debian/patches/series                              |  1 -
 markdown/__version__.py                            |  2 +-
 tests/extensions/extra/tables.html                 | 15 ++++++++++++++
 tests/extensions/extra/tables.txt                  |  8 +++++++-
 7 files changed, 28 insertions(+), 31 deletions(-)

diff --cc debian/.git-dpm
index 62b72b3,0000000..408d869
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
- 712c5f12dc8bbc72895f49231ed2ccd716fc9694
- 712c5f12dc8bbc72895f49231ed2ccd716fc9694
- 68e168093a0a374d305b0faa5e3b79ef8d52a3eb
++cbeb43ef9f5e9c12a0bda1f34eadcebd5e634f39
++cbeb43ef9f5e9c12a0bda1f34eadcebd5e634f39
++cbeb43ef9f5e9c12a0bda1f34eadcebd5e634f39
 +cbeb43ef9f5e9c12a0bda1f34eadcebd5e634f39
 +python-markdown_2.6.5.orig.tar.gz
 +d94ffb2185286f2ff64e7ec8624f2de184776dba
 +301781
 +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-markdown.git