[jlm] 09/11: Merge tag 'upstream/2.0' into debian-debian

[Martin Quinson]

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

mquinson pushed a commit to branch debian-debian
in repository jlm.

commit 20aa6ed30be547f42596273d6f38ec38669505f1
Merge: b28f5c4 f526208
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Mon Aug 5 00:01:11 2013 +0200

    Merge tag 'upstream/2.0' into debian-debian
    
    Upstream version 2.0

 src/lessons/sort/pancake/GatesPancake.fr.html |   16 ++++++++--------
 src/lessons/sort/pancake/GatesPancake.html    |   16 ++++++++--------
 src/lessons/welcome/variables/RunFour.java    |    2 +-
 src/lessons/welcome/variables/RunHalf.java    |    2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/jlm.git