[sikuli] 91/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 4ad4d34d280babb147f4fd7a57316ab7e5e4e1ca
Merge: d955c8a 5e19fe9
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Tue Dec 31 16:10:52 2013 +0100

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

 Basics/README.md | 2 +-
 README.md        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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