[Pkg-ocaml-maint-commits] [marionnet] 16/19: Merge tag 'upstream/0.90.6+bzr508'

[Lucas Nussbaum]

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

lucas pushed a commit to branch master
in repository marionnet.

commit a6af986b9cfe973f54f84a51557fba4a1a9af71f
Merge: eba6026 154c694
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Mon Oct 30 23:21:10 2017 +0100

    Merge tag 'upstream/0.90.6+bzr508'
    
    Upstream version 0.90.6+bzr508

 Makefile            |  4 +--
 Makefile.local      |  5 +++-
 meta.ml.released    | 10 ++++----
 po/messages.pot     | 74 ++++++++++++++++++++++++++---------------------------
 router.ml           | 16 +++++++++---
 simulation_level.ml |  4 +--
 6 files changed, 62 insertions(+), 51 deletions(-)

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