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


Trivial merge