diff options
| author | Aaron Stone <aaron@serendipity.cx> | 2012-10-19 01:35:10 -0700 |
|---|---|---|
| committer | Aaron Stone <aaron@serendipity.cx> | 2012-10-19 01:35:10 -0700 |
| commit | 2b540b6d2b3c6acab48ad1515b4d5da98d363391 (patch) | |
| tree | 6a2223ea8ea36790943ec8e433868ebbda6d690c /LICENSE | |
| parent | 72df8ecb489c13a0bf7bdb78455e6d523404dd8b (diff) | |
| parent | 109d181b8ec6130151b2e8144cdaecf986a96075 (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 'LICENSE')
| -rw-r--r-- | LICENSE | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ -Copyright (C) 2010 Reductive Labs Inc. +Copyright (C) 2010-2012 Puppet Labs Inc. -Reductive Labs can be contacted at: info@reductivelabs.com +Puppet Labs can be contacted at: info@puppetlabs.com This program and entire repository is free software; you can redistribute it and/or modify it under the terms of the GNU |