Merge branch 'master' of https://github.com/scala/scala.github.com

phaller · phaller · commit e9a5e0186cf0 · 2013-06-30T15:22:13.000-07:00
diff --git a/README.md b/README.md
@@ -59,3 +59,4 @@ There exists a free markdown editor for OSX called [Mou](http://mouapp.com/). It
 ## License ##
 
 All documentation contained in this repository is licensed by EPFL under a Creative Commons Attribution-Share Alike 3.0 Unported license ("CC-BY-SA"), unless otherwise noted. By submitting a "pull request," or otherwise contributing to this repository, you implicitly agree to license your contribution under the above CC-BY-SA license. The source code of this website is licensed to EPFL under the [Scala License](http://www.scala-lang.org/node/146), unless otherwise noted.
+

Original file line number	Diff line number	Diff line change
`@@ -59,3 +59,4 @@ There exists a free markdown editor for OSX called [Mou](http://mouapp.com/). It`
`59`	`59`	`## License ##`
`60`	`60`
`61`	`61`	`All documentation contained in this repository is licensed by EPFL under a Creative Commons Attribution-Share Alike 3.0 Unported license ("CC-BY-SA"), unless otherwise noted. By submitting a "pull request," or otherwise contributing to this repository, you implicitly agree to license your contribution under the above CC-BY-SA license. The source code of this website is licensed to EPFL under the [Scala License](http://www.scala-lang.org/node/146), unless otherwise noted.`
	`62`	`+`