Merge branch 'parameterized_classes' into leap
authorMicah Anderson <micah@riseup.net>
Wed, 3 Apr 2013 19:03:12 +0000 (15:03 -0400)
committerMicah Anderson <micah@riseup.net>
Wed, 3 Apr 2013 19:03:12 +0000 (15:03 -0400)
commit75d387fc8aff12232fdeae2efbbfccdd91f94656
tree3890e9baa3a659bfd04938e3185dbacc4408fc62
parent74fe8e6a586bec3b04a7b51beb4ed2f8fbc27e03
parent1e6fbdf7f1f7e381ef01170eab96727377abe3b6
Merge branch 'parameterized_classes' into leap

Conflicts:
manifests/init.pp