Merge branch 'parameterized_classes' into riseup
authorMicah Anderson <micah@riseup.net>
Wed, 3 Apr 2013 19:05:18 +0000 (15:05 -0400)
committerMicah Anderson <micah@riseup.net>
Wed, 3 Apr 2013 19:05:18 +0000 (15:05 -0400)
Conflicts:
manifests/init.pp


Trivial merge