diff options
| author | Micah Anderson <micah@riseup.net> | 2010-09-02 19:12:58 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-09-02 19:12:58 -0400 |
| commit | a5e4ab40d8e5074c3ef6525358858376c5dbdab7 (patch) | |
| tree | f3342e4da7e620a7d43564cf7496d666c80b46e6 /files/preferences | |
| parent | 9b916b3224b194c3e6805855b83886eae3e9fd39 (diff) | |
| parent | dd36612e50b2c44135fa10fdc3d6120ff2b1220e (diff) | |
| download | puppet-apt-a5e4ab40d8e5074c3ef6525358858376c5dbdab7.tar.gz puppet-apt-a5e4ab40d8e5074c3ef6525358858376c5dbdab7.tar.bz2 | |
Merge remote branch 'immerda/master'
Conflicts:
manifests/init.pp
Diffstat (limited to 'files/preferences')
0 files changed, 0 insertions, 0 deletions