diff options
| author | varac <varacanero@zeromail.org> | 2014-02-25 15:43:42 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-25 15:43:42 +0100 |
| commit | c2539d1ea132e137d29f3183e7aac568462865b0 (patch) | |
| tree | aa71997081abe88e95fd07d8e532ce8afbcf7cea /9b10a1e8e73863e428601e21c94b3ef664d1eaa7 | |
| parent | 705fd0a13dc4d2f073819947159e28b54c286550 (diff) | |
| parent | 34333c48ba5662228c37a70eb099ec9a5f96b5ac (diff) | |
Merge branch 'leap_master'
Conflicts:
files/munin/dovecot
manifests/base.pp
manifests/centos.pp
manifests/debian.pp
manifests/expire.pp
manifests/init.pp
manifests/munin.pp
manifests/quota.pp
manifests/sieve.pp
manifests/sql.pp
Diffstat (limited to '9b10a1e8e73863e428601e21c94b3ef664d1eaa7')
0 files changed, 0 insertions, 0 deletions