diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:50:43 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:50:43 +0100 |
| commit | 3de76e7b05224b9696a75908b0a4259349e20823 (patch) | |
| tree | 428799424b34d7911e6dd39a0ab2ef94c7900525 /manifests/preferences.pp | |
| parent | f25a8a91099d6c1ef512a5fb21581abc62e1519a (diff) | |
| parent | 92aa5a51e95d74604a40318558aa98f70fcf7720 (diff) | |
| download | puppet-apt-3de76e7b05224b9696a75908b0a4259349e20823.tar.gz puppet-apt-3de76e7b05224b9696a75908b0a4259349e20823.tar.bz2 | |
Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.
A bunch of painlessly merged commits.
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/preferences.pp')
0 files changed, 0 insertions, 0 deletions