Fix for process check wehn passenger is enabled
Merge branch 'master' of git://github.com/example42/puppet-puppet
Fix for https://github.com/example42/puppet-puppet/issues/24
Fix for https://github.com/example42/puppet-puppet/issues/25
Add geppetto infrastructure and update .gitignore
Add some comments
Merge pull request #26 from DavidS/geppetto-fixes

Geppetto fixes
Fix for post/pre commands, when empty
Merge branch 'master' of https://github.com/example42/puppet-puppet
Apache won't start when the SSL files are missing.
Merge pull request #27 from erik-smit/puppetplayground

Apache won't start when the SSL files are missing.
ENH: set masterport in client's and server's puppet.conf
Merge pull request #28 from atmosfair/port

ENH: set masterport in client's and server's puppet.conf
Merge pull request #3 from example42/master

Upstream pull