[sikuli] 355/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 1146c48984ee1b79c34c39634fca2863add3d19f
Merge: d54fc0e dd563ef
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Sun Apr 13 13:03:02 2014 +0200

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

 createJavadocs | 2 ++
 1 file changed, 2 insertions(+)

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