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

[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 64d994f35cb5bb9624c7f0168f41436d7697d420
Merge: f783993 288eee8
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Thu Aug 9 15:56:12 2012 +0200

    Merge tag 'upstream/2.1.5a'
    
    Upstream version 2.1.5a

 VERSION       |  2 +-
 configure.inc | 10 ++++++++--
 markdown.c    |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

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