diff options
| author | mh <mh@immerda.ch> | 2013-01-02 19:54:17 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-01-02 19:54:17 +0100 |
| commit | 8b4e71729288d25e44d8433be27dc1a5d9fe63d9 (patch) | |
| tree | 5460675cf9f10df08f298c777d1e37d8fbcfbb6f /manifests/debian.pp | |
| parent | 4d2d0a813a718ad412fbd05da8588b8e90d0b9a3 (diff) | |
| parent | 4d6b051acd53217860e1401946e45550e20c91a0 (diff) | |
Merge remote-tracking branch 'shared/master'
Conflicts:
README
manifests/service.pp
Diffstat (limited to 'manifests/debian.pp')
0 files changed, 0 insertions, 0 deletions