[DRE-commits] [SCM] rails-4.0.git branch, master, updated. debian/4.0.0_rc1-1-18-gbcd6e5c

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 768917d8449eb18c4543249d1183a46631c7244b
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 19 15:44:44 2013 +0200

    Replace and/or in copyright with just or (or is more permissive)

diff --git a/debian/copyright b/debian/copyright
index 28633cb..2abc076 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,7 +17,7 @@ Files: actionpack/test/controller/selector_test.rb
        actionpack/lib/action_view/vendor/html-scanner/html/selector.rb
        actionpack/lib/action_dispatch/testing/assertions/selector.rb
 Copyright: 2006 Assaf Arkin (http://labnotes.org)
-License: MIT and/or CC-BY
+License: MIT or CC-BY
 
 Files: debian/*
 Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>

-- 
rails-4.0.git