Skip to content
Browse files

Merge branch 'josh' into develop

  • Loading branch information...
2 parents 6562137 + 06f048e commit 8d1a85a8d0e542088f3cb5d87e506356f6e6a499 @kennethreitz kennethreitz committed Mar 12, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 LICENSE
View
4 LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Kenneth Reitz.
+Copyright (c) 2012 Josh Ourisman.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
@@ -10,4 +10,4 @@ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

0 comments on commit 8d1a85a

Please sign in to comment.
Something went wrong with that request. Please try again.