[Reproducible-commits] [discount] 82/121: Merge tag 'upstream/2.1.5'

[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 c5788f6346e8ff3517c97a5086c490be897b85cf
Merge: 332b105 a891dc0
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Wed Aug 8 21:01:31 2012 +0200

    Merge tag 'upstream/2.1.5'
    
    Upstream version 2.1.5

 Csio.c             |   2 +-
 Makefile.in        |  13 +++---
 VERSION            |   2 +-
 configure.inc      | 128 +++++++++++++++++++++++++++++++----------------------
 configure.sh       |  19 ++++++--
 cstring.h          |   4 +-
 flags.c            |   1 +
 generate.c         | 101 ++++++++++++++++++++++++++----------------
 github_flavoured.c | 100 +++++++++++++++++++++++++++++++++++++++++
 main.c             |  30 ++++++++++---
 markdown.1         |  14 ++++--
 markdown.c         |  40 ++++++++++++-----
 markdown.h         |  37 ++++++++++++++--
 mkd2html.c         |  27 ++++++-----
 mkdio.c            |  42 ++++++++----------
 mkdio.h.in         |   6 +++
 pgm_options.c      |   7 ++-
 tests/code.t       |  15 +++++++
 tests/style.t      |   2 +
 theme.1            |   2 +
 theme.c            |  22 +++++++--
 21 files changed, 446 insertions(+), 168 deletions(-)

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