diff options
| author | Micah Anderson <micah@riseup.net> | 2012-03-07 11:02:01 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-03-07 11:02:01 -0500 |
| commit | e9ff8b6a233ad38b18fd4f64413ef0b89186b78f (patch) | |
| tree | b01690dd25e3035273502d76fa2daae30df4eaa9 /README | |
| parent | e68fdf60f5ddd2c5e3a3ec5cba4730b5124275ed (diff) | |
| parent | af8b414c325dd2454c8fc98e9b1b0829c834c856 (diff) | |
Merge remote-tracking branch 'lelutin/root_pw_no_arg' into shared
Conflicts:
manifests/server/base.pp
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions