summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorAaron Stone <aaron@serendipity.cx>2012-10-19 01:35:10 -0700
committerAaron Stone <aaron@serendipity.cx>2012-10-19 01:35:10 -0700
commit2b540b6d2b3c6acab48ad1515b4d5da98d363391 (patch)
tree6a2223ea8ea36790943ec8e433868ebbda6d690c /Rakefile
parent72df8ecb489c13a0bf7bdb78455e6d523404dd8b (diff)
parent109d181b8ec6130151b2e8144cdaecf986a96075 (diff)
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
Diffstat (limited to 'Rakefile')
0 files changed, 0 insertions, 0 deletions