Merge branch 'master' of https://github.com/example42/puppet-puppet
Merge branch 'master' of https://github.com/example42/puppet-puppet
Merge branch 'master' of https://github.com/example42/puppet-puppet
Merge branch 'master' of https://github.com/example42/puppet-puppet
Ruby gem name changed in Debian
Merge branch 'master' of https://github.com/example42/puppet-puppet

Conflicts:
	manifests/params.pp
Merge branch 'master' of https://github.com/example42/puppet-puppet
Merge branch 'master' of https://github.com/example42/puppet-puppet
Merge branch 'master' of https://github.com/example42/puppet-puppet
Merge branch 'master' of https://github.com/example42/puppet-puppet
Merge branch 'master' of https://github.com/example42/puppet-puppet
Configure passenger to use UTF-8 for strings encoding.
Merge pull request #71 from gwarf/passenger_ruby_encoding_utf8

Configure passenger to use UTF-8 for strings encoding.
Merge pull request #67 from Freeaqingme/ssllogdir

Manage ssl and log dir
Merge branch 'master' of https://github.com/example42/puppet-puppet
Fix $log_dir permissions

Commit 3cbb6ba8ff06d8e2b68e00d44b86c3b6a8f64870 changed permissions to
puppet's` $log_dir` that
are incompatible with passenger configuration (See puppet's issues:
[#13914](http://projects.puppetlabs.com/issues/13914) and
[#13931](http://projects.puppetlabs.com/issues/13931)).

Even if not writing to the file, puppetmaster fails to start if it can't set
permssions to file masterhttp.log
Merge branch 'fix_passenger_permissions'
SSL dir has the wrong `$ensure` type

Commit 3cbb6ba8ff06d8e2b68e00d44b86c3b6a8f64870 adds puppet's SSL dir
management, but treats it like a file as has no proper ensure set.
Merge branch 'fix_passenger_permissions'
Merge pull request #72 from netmanagers/master

Fix permissions regressions created by PR #67