diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-13 15:24:02 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-13 15:24:02 -0500 |
| commit | 5acc8bab68a718d7d91fa4e5b26a515cd88bd680 (patch) | |
| tree | e6db5e010b4dd5b32db018dcdb79177bfbee98bd /ff239a726ff530326ed7a56ad5ea6203a6f9bd3f | |
| parent | d5452d0fa6c843d541c2038f76c6b33a8c96ab4f (diff) | |
| parent | f4c0de8cd4225fab2ff6ef2a5da77d96f762e53c (diff) | |
Merge branch 'add_customizable_distributions' into leap
Conflicts:
manifests/repository.pp
Diffstat (limited to 'ff239a726ff530326ed7a56ad5ea6203a6f9bd3f')
0 files changed, 0 insertions, 0 deletions