[Reproducible-commits] [discount] 56/121: Merge commit 'upstream/2.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 1e6ceef2b23573f5ae656e22603ca8d12fbaff3e
Merge: 1df5b72 24edcbb
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Wed Jan 18 20:36:28 2012 +0100

    Merge commit 'upstream/2.1.3'

 Makefile.in     | 49 ++++++++++++++++++++++++++-----------------------
 VERSION         |  2 +-
 configure.inc   |  8 +++++---
 generate.c      | 28 ++++++++++++++++++----------
 main.c          |  1 -
 makepage.c      |  1 -
 mkd2html.c      |  1 -
 mktags.c        |  2 --
 tests/defects.t | 17 +++++++++++++++++
 tests/html.t    |  9 ---------
 tests/tables.t  | 22 ++++++++++++++++++++++
 tests/toc.t     | 12 ++++++++----
 theme.c         |  1 -
 toc.c           | 31 +++++++++++++++++++++----------
 14 files changed, 118 insertions(+), 66 deletions(-)

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