Merge remote-tracking branch 'sarava/master'
authorMicah Anderson <micah@riseup.net>
Fri, 25 Mar 2011 04:59:48 +0000 (00:59 -0400)
committerMicah Anderson <micah@riseup.net>
Fri, 25 Mar 2011 04:59:48 +0000 (00:59 -0400)
commit233229435f4dacc5c1f14e1756b0d5810448f00c
tree142bda5632e2f0084cb64f8f8c5ab130623e5870
parentab9bc25704ac0c560cc8f11ae6ef67402cde3830
parent46baf4a692932482cac32eff91d49de461411bac
Merge remote-tracking branch 'sarava/master'

Conflicts:
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/defines/module_file.pp
manifests/init.pp
manifests/defines/line.pp
manifests/defines/module_file.pp