[openjk] 02/06: Merge tag 'upstream/0_20150430+dfsg1'

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openjk.

commit 5307722d884adda73a1b1aeb95db4ac890485a74
Merge: 4554fba 8eca808
Author: Simon McVittie <smcv at debian.org>
Date:   Mon May 11 09:36:19 2015 +0100

    Merge tag 'upstream/0_20150430+dfsg1'
    
    Upstream version 0~20150430+dfsg1
    
    Conflicts:
    	codeJK2/icarus/tokenizer.h

 codeJK2/icarus/tokenizer.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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