[sikuli] 64/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 e9a3554586f91cb4698426517b06aec19f0033bf
Merge: dd918ef 8ee74a3
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Sun Dec 29 12:54:58 2013 +0100

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

 API/README.md |  9 +++++----
 README.md     | 26 +++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

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