Merge remote-tracking branch 'sarava/adapt-to-jessie'

diff --cc manifests/gitolite.pp
index b04926b536136494ecb8d2b984296724591617c2,e4e33d7baf10d437869eacfbf71acfb9e626cb2a..64220c14bcc41556901a1bbb754cced87059b199
--- 1/manifests/gitolite.pp
--- 2/manifests/gitolite.pp
+++ b/manifests/gitolite.pp
@@@ -34,10 -34,10 +34,10 @@@ class git::gitolite inherits git 
    package { "gitosis": ensure => purged }
  
    # ensures that the group exists
 -  group { "gitolite":
 +  group { "git":
      ensure    => present,
      allowdupe => false,
-     require   => Package["gitolite"],
+     require   => Package["gitolite3"],
    }
  
    # alters the user's home dir