[colobot] 08/62: Merge branch 'master' into dev

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository colobot.

commit 199210c2ad46a1df7b051998ec6123a90df8202c
Merge: 8058a89 92a8140
Author: krzys-h <krzys_h at interia.pl>
Date:   Mon May 29 21:13:17 2017 +0200

    Merge branch 'master' into dev
    
    See 92a8140b778675a769440dc206b11b8012734bff

 Jenkinsfile | 4 ++++
 data        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git