from p2
Merge branch 'master' of ssh://localhost:1234/juskoa/trigger