[colobot] 06/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 8058a89cdef7c1385c014c945e6f53104ac5e922
Merge: f461465 daacd00
Author: krzys-h <krzys_h at interia.pl>
Date:   Mon May 29 20:53:46 2017 +0200

    Merge branch 'master' into dev
    
    I messed up and merged #967 into master by mistake, but since it's only a change to README I won't bother reverting it

 INSTALL-MacOSX.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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