diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:44:05 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:44:05 +0100 |
| commit | 9ab979897f62430736e4b4c06c2339f50a4edd7d (patch) | |
| tree | a4f18ac2278531a857b2ecac1a3d3355a82135a1 /manifests/proxy_client.pp | |
| parent | f22861e820dc2c7f638561a2704dff19810daa66 (diff) | |
| parent | 3c88b19dd33b4da1f37e2c08c981ccbcbe5a45a8 (diff) | |
| download | puppet-apt-9ab979897f62430736e4b4c06c2339f50a4edd7d.tar.gz puppet-apt-9ab979897f62430736e4b4c06c2339f50a4edd7d.tar.bz2 | |
Merge commit '3c88b19dd33b4da1f37e2c08c981ccbcbe5a45a8'.
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/proxy_client.pp')
0 files changed, 0 insertions, 0 deletions