Merge branch 'master' of git://labs.riseup.net/shared-common
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 14 Feb 2011 14:11:35 +0000 (12:11 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 14 Feb 2011 14:11:35 +0000 (12:11 -0200)
commit0b03f41b32e8423bbbfa3c8a6b02dbf17c04f4c1
treec5d7863c96377394b8559fbd5c7777fb32b6fda1
parente0080adb1ca115ee98bf97c9cfb91fccbfeddaac
parenta81984c77ed1efb56e978d8b5050b6c3ec409d80
Merge branch 'master' of git://labs.riseup.net/shared-common

Conflicts:
lib/puppet/parser/functions/gsub.rb
lib/puppet/parser/functions/prefix_with.rb
lib/puppet/parser/functions/slash_escape.rb
lib/puppet/parser/functions/split.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/concatenated_file.pp
manifests/defines/config_file.pp
manifests/defines/line.pp
manifests/defines/replace.pp