diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2010-10-17 20:35:35 -0400 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2010-10-17 20:35:35 -0400 |
| commit | 296593bcbd7d5cc329737830bb938f93abf3fa3d (patch) | |
| tree | 70b00c8221b111767723952fd382c63257de4920 /manifests/default_preferences.pp | |
| parent | 521ccfec19d40fa5d78162727afa26c15778c173 (diff) | |
| parent | 356ff9334078198fde39fe5c8e8212109d6537a0 (diff) | |
Merge remote branch 'riseup/master'
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/default_preferences.pp')
0 files changed, 0 insertions, 0 deletions