Merge remote branch 'immerda/master'
authorMicah Anderson <micah@riseup.net>
Thu, 2 Sep 2010 23:04:29 +0000 (19:04 -0400)
committerMicah Anderson <micah@riseup.net>
Thu, 2 Sep 2010 23:04:29 +0000 (19:04 -0400)
commit63a16ad8c07e880e68cb7c0a895f7e26ca1434f8
tree1ca7da340aef82e8fe87f44c680cedc93795ecbf
parent76b0a31a76b8ab7509da3389379daa24b0610f73
parent51e06fd0d2fa1c8999f328051e5e717bc18e77e7
Merge remote branch 'immerda/master'

Conflicts:
lib/puppet/parser/functions/gsub.rb
lib/puppet/parser/functions/prefix_with.rb
lib/puppet/parser/functions/sha1.rb
lib/puppet/parser/functions/slash_escape.rb
lib/puppet/parser/functions/substitute.rb
manifests/classes/lsb_release.pp
manifests/defines/concatenated_file.pp
manifests/defines/config_file.pp
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/defines/module_file.pp
manifests/defines/replace.pp
manifests/init.pp
manifests/defines/config_file.pp
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/defines/module_file.pp
manifests/defines/replace.pp
manifests/init.pp