Merge remote-tracking branch 'upstream/master'
forgot to escape -> syntax-error
environment is already used by puppet, so lets use env
set puppi run timeout to 900s
parametrising timeout
Merge pull request #1 from MalteJ/puppi-timeout900

Puppi timeout900
adding support for hybris 5
fixing path in files/scripts/yant.sh
fixing yant.sh path
omitting dir times when rsyncing during deploy
adding hybris extensions
fixing
merged
fixing y5maven priorities
moving y5maven puppi project to hybris repository - no need for example42 pulls anymore ;-)
reverting some changes to keep upstream kompatibility to example42
Merge branch 'master' of git://github.com/example42/puppi
Fixing netinstall for edge cases with multiple defines with same source
Merge
Testing