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)
Conflicts:
manifests/init.pp


Trivial merge