[colobot] 218/390: Merge pull request #387 from tomangelo2/dev

[Didier Raboud]

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

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit bb6d627bc243c8548abcc73162e599dbc0265183
Merge: 80c9b35 7b03479
Author: krzys_h <krzys_h at interia.pl>
Date:   Wed Nov 12 10:16:43 2014 +0100

    Merge pull request #387 from tomangelo2/dev
    
    Fixed #386

 src/script/cbottoken.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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