[zoo-project] 02/12: Merge tag 'upstream/1.6.0+ds'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository zoo-project.

commit 8100b0113990475aa263bbb2127fef4c8fd00d4d
Merge: e1a0119 d81b87c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 29 17:41:05 2017 +0100

    Merge tag 'upstream/1.6.0+ds'
    
    Upstream version 1.6.0+ds

 .DS_Store                                        | Bin 0 -> 6148 bytes
 ._.DS_Store                                      | Bin 0 -> 120 bytes
 zoo-project/zoo-kernel/Makefile.in               |   6 ++++--
 zoo-project/zoo-kernel/ZOOMakefile.opts.in       |   3 ++-
 zoo-project/zoo-kernel/configure                 |  20 ++++++++++++++++++++
 zoo-project/zoo-kernel/configure.ac              |  13 +++++++++++++
 zoo-project/zoo-kernel/locale/po/it_IT.po        |  14 +++++++-------
 zoo-project/zoo-kernel/{main.cfg => main.cfg.in} |   4 ++--
 zoo-project/zoo-services/utils/status/Makefile   |   5 ++++-
 9 files changed, 52 insertions(+), 13 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/zoo-project.git