[Pkg-ocaml-maint-commits] [mldonkey] 04/07: Merge tag 'upstream/3.1.5'

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository mldonkey.

commit d386b4ed9b11ae579b8e17e963c9349b4b7cc07b
Merge: 8d20f39 741bb84
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Mar 27 00:14:35 2014 +0100

    Merge tag 'upstream/3.1.5'
    
    Upstream version 3.1.5

 config/configure                      |  2 +-
 config/configure.in                   |  2 +-
 distrib/ChangeLog                     |  3 ++
 src/daemon/common/commonMessages.ml   |  6 ++-
 src/daemon/driver/driverCommands.ml   |  2 +-
 src/daemon/driver/driverControlers.ml |  2 +-
 src/utils/lib/gettext.ml4             | 96 ++++++++++++++++++++++++++++++++---
 src/utils/lib/gettext.mli             | 45 ++++++++++++++++
 8 files changed, 146 insertions(+), 12 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mldonkey.git