[sikuli] 34/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 1deb7cd1f5f263c32a27950ab455a6bc1c83fb0a
Merge: fbc5dec 7fac39b
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Thu Dec 26 11:20:19 2013 +0100

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

 Docs/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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