[Reproducible-commits] [discount] 39/121: Merge commit 'upstream/2.1.1.3'

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/reproducible_builds
in repository discount.

commit 9c0c897fd21d908b424ea99ffa1f1355eaead5fe
Merge: 3467797 38e6fbd
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Mon Aug 1 22:23:14 2011 +0200

    Merge commit 'upstream/2.1.1.3'

 Makefile.in           |   5 ++
 VERSION               |   2 +-
 configure.inc         |  21 ++++-
 configure.sh          |   3 +
 generate.c            |  25 +++---
 html5.c               |   2 -
 markdown.c            | 228 +++++++++++++++++++++++++++++++++-----------------
 markdown.h            |   6 ++
 tags.c => mktags.c    |  66 ++++-----------
 setup.c               |  10 +--
 tags.c                | 100 ++++++++--------------
 tests/code.t          |  56 +++++++++++++
 tests/dl.t            |  13 +--
 tests/functions.sh    |   9 +-
 tests/para.t          |   6 +-
 tests/peculiarities.t |   2 +-
 tests/reddit.t        |   2 +-
 tests/smarty.t        |   5 +-
 tests/strikethrough.t |   1 +
 tests/tables.t        |   8 +-
 version.c.in          |   3 +
 21 files changed, 332 insertions(+), 241 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/discount.git