Merge branch '1.0.x' into test_merge
Conflicts:
CHANGELOG.md
Gemfile
Modulefile
README.markdown
Rakefile
files/concatfragments.sh
manifests/setup.pp
metadata.json
spec/acceptance/backup_spec.rb
spec/acceptance/concat_spec.rb
spec/acceptance/empty_spec.rb
spec/acceptance/fragment_source_spec.rb
spec/acceptance/newline_spec.rb
spec/acceptance/nodesets/centos-64-x64.yml
spec/acceptance/nodesets/default.yml
spec/acceptance/nodesets/fedora-18-x64.yml
spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
spec/acceptance/order_spec.rb
spec/acceptance/replace_spec.rb
spec/acceptance/symbolic_name_spec.rb
spec/acceptance/warn_spec.rb
spec/spec_helper_acceptance.rb