[sikuli] 369/385: Merge branch 'master' of https://github.com/RaiMan/SikuliX-2014

[Gilles Filippini]

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

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit 38dfa86137f8c29178ba0c3b063165bbee63812d
Merge: f767222 5e2af13
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Thu Apr 24 12:19:27 2014 +0200

    Merge branch 'master' of https://github.com/RaiMan/SikuliX-2014

 Basics/src/main/java/org/sikuli/basics/SikuliXforJython.java       | 2 +-
 JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

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