diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-13 11:58:37 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-13 11:58:37 -0500 |
| commit | e20017a22d135361980c4889f1827e5ecd3fd1af (patch) | |
| tree | 9e7c44c39cb7b481c8320ff73c785370ed0cba9d /9b0b7e0505d9bc5adeea389a9c8aeb833c4fc13d | |
| parent | 4ea15148100fdf0f8b172901c41ba58b06ff0bec (diff) | |
| parent | cc12ced0f3f62c975f9f711da67770ffb33d7ba7 (diff) | |
Merge branch 'master' into leap
this brings our master back to before we made some changes. I've split out
those changes into topic branches, and rebased them on top of the current state
of master. I will merge those in next
Conflicts:
manifests/init.pp
templates/distributions.erb
Diffstat (limited to '9b0b7e0505d9bc5adeea389a9c8aeb833c4fc13d')
0 files changed, 0 insertions, 0 deletions