[sikuli] 334/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 adceeb38eddf0244dc3198fe8aabf4425127f43b
Merge: a250543 5a525b9
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Wed Apr 2 16:42:56 2014 +0200

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

 Basics/pom.xml | 172 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 92 insertions(+), 80 deletions(-)

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