[sikuli] 329/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 e2fe3c3e7980d6a8e026e298b1c1403d87f4c3d8
Merge: 4c69b75 8d55e81
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Mon Mar 24 10:27:14 2014 +0100

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

 Basics/src/main/resources/Lib/sikulix.rb |  8 ++++----
 JRuby/pom.xml                            |  2 +-
 JRubyFat/pom.xml                         |  2 +-
 README.md                                | 12 ++++++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

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