Merge branch 'master' into dummy-provider
authorAaron Stone <aaron@serendipity.cx>
Fri, 19 Oct 2012 08:35:10 +0000 (01:35 -0700)
committerAaron Stone <aaron@serendipity.cx>
Fri, 19 Oct 2012 08:35:10 +0000 (01:35 -0700)
commit2b540b6d2b3c6acab48ad1515b4d5da98d363391
tree6a2223ea8ea36790943ec8e433868ebbda6d690c
parent72df8ecb489c13a0bf7bdb78455e6d523404dd8b
parent109d181b8ec6130151b2e8144cdaecf986a96075
Merge branch 'master' into dummy-provider

Conflicts:
lib/puppet/provider/vcsrepo/cvs.rb
spec/support/fixture_helpers.rb
spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
README.GIT.markdown
lib/puppet/provider/vcsrepo/cvs.rb