Merge remote-tracking branch 'shared/master' into leap_master
authorvarac <varacanero@zeromail.org>
Wed, 2 Dec 2015 10:53:45 +0000 (11:53 +0100)
committervarac <varacanero@zeromail.org>
Wed, 2 Dec 2015 10:53:45 +0000 (11:53 +0100)
1  2 
manifests/service.pp

Simple merge