Merge remote-tracking branch 'remotes/github/master'

cretz · cretz · commit 1812bcb9ceec · 2014-10-27T12:16:11.000-05:00
Conflicts:
	LICENSE
	README.md
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,6 @@
-Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
+The MIT License (MIT)
+
+Copyright (c) 2014 The SoftLayer Developer Network
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# softlayer-api-client
+# softlayer-java
 
 ## Introduction
 
@@ -265,4 +265,4 @@ fully qualified class name of your implementation on a single line in a file in
 
 ## Copyright
 
-This software is Copyright (c) 2014 SoftLayer Technologies, Inc. See the bundled LICENSE file for more information.
+This software is Copyright (c) 2014 The SoftLayer Developer Network. See the bundled LICENSE file for more information.
