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)
commit9e209455b5ca957fc8c939d1222ba3abf66f0595
tree3890e9baa3a659bfd04938e3185dbacc4408fc62
parent38ce9a5950f1aadfb8b844c2ba4d280b06456489
parent1e6fbdf7f1f7e381ef01170eab96727377abe3b6
Merge branch 'parameterized_classes' into riseup

Conflicts:
manifests/init.pp