Silvio Rhatto 0b03f41b32 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		2011-02-14 12:11:35 -02:00
..
parser/functions	Merge branch 'master' of git://labs.riseup.net/shared-common	2011-02-14 12:11:35 -02:00