Relicense to dual MIT/Apache-2.0 and tiny lincense fixes

Closes #5

AUTHORS

@@ -0,0 +1,2 @@
+Gunnar Bergmann
+Eduard Bopp

Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Marthog <[email protected]>"]
 
 description = "Implementation of Software transactional memory. Allows composable atomic operations."
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 homepage = "https://github.com/Marthog/rust-stm"
 repository = "https://github.com/Marthog/rust-stm"
 documentation = "http://marthog.github.io/rust-stm/target/doc/stm"

LICENSE-MIT

@@ -1,6 +1,4 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Gunnar Bergmann
+Copyright (c) 2015-2016 The rust-stm Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

README.md

@@ -67,13 +67,14 @@ println!("var = {}", x);
 
 Licensed under either of
 
- * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
  * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
 at your option.
 
 ### Contribution
 
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
+Unless you explicitly state otherwise, any contribution intentionally
+submitted for inclusion in the work by you, as defined in the Apache-2.0
+license, shall be dual licensed as above, without any additional terms or
+conditions.

src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2015 Gunnar Bergmann
+// Copyright 2015-2016 rust-stm Developers
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

src/log.rs

@@ -1,4 +1,4 @@
-// Copyright 2015 Gunnar Bergmann
+// Copyright 2015-2016 rust-stm Developers
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

src/macros.rs

@@ -1,4 +1,4 @@
-// Copyright 2015 Gunnar Bergmann
+// Copyright 2015-2016 rust-stm Developers
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

src/stm.rs

@@ -1,4 +1,4 @@
-// Copyright 2015 Gunnar Bergmann
+// Copyright 2015-2016 rust-stm Developers
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

src/var.rs

@@ -1,4 +1,4 @@
-// Copyright 2015 Gunnar Bergmann
+// Copyright 2015-2016 rust-stm Developers
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license