Merge remote-tracking branch 'leap/master' into riseup
authorMicah Anderson <micah@riseup.net>
Wed, 3 Apr 2013 18:36:04 +0000 (14:36 -0400)
committerMicah Anderson <micah@riseup.net>
Wed, 3 Apr 2013 18:36:04 +0000 (14:36 -0400)
commit38ce9a5950f1aadfb8b844c2ba4d280b06456489
tree134fddead133ab7442afbcc8a6cba624ddb6a488
parent95f55b7586e850fc9d31fc08a86a5bf25a7abb37
parent74fe8e6a586bec3b04a7b51beb4ed2f8fbc27e03
Merge remote-tracking branch 'leap/master' into riseup

Conflicts:
manifests/centos.pp
manifests/init.pp
manifests/linux.pp