diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:41:56 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:41:56 +0100 |
| commit | f22861e820dc2c7f638561a2704dff19810daa66 (patch) | |
| tree | f73f4192205053459f7da4c94532a6bb5b21c726 /manifests/listchanges.pp | |
| parent | 71d42350d1edb643a20e651a6c4ab965e6903305 (diff) | |
| parent | 27d5808299045ebd6f428e7d8131d11d9ab37712 (diff) | |
| download | puppet-apt-f22861e820dc2c7f638561a2704dff19810daa66.tar.gz puppet-apt-f22861e820dc2c7f638561a2704dff19810daa66.tar.bz2 | |
Merge commit '27d5808299045ebd6f428e7d8131d11d9ab37712'.
One more painless merge commit.
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/listchanges.pp')
0 files changed, 0 insertions, 0 deletions