Merge branch 'release/0.6.3' into develop

2 files changed, 20 insertions, 20 deletions

diff --git a/LICENSE b/LICENSE
index b77f7909a..30f629158 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,16 @@
-The MIT License (MIT)
+Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
 
-Copyright (c) 2013 Jeffrey Wilcke
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-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:
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
 
-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.
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301  USA
diff --git a/README.md b/README.md
index 5b0f6e07f..3ed340612 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Ethereum
 Ethereum Go Development package (C) Jeffrey Wilcke
 
 Ethereum is currently in its testing phase. The current state is "Proof
-of Concept 0.6.0". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)).
+of Concept 0.6.3". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)).
 
 Ethereum Go is split up in several sub packages Please refer to each
 individual package for more information.
@@ -15,6 +15,11 @@ individual package for more information.
   3. [ethwire](https://github.com/ethereum/eth-go/tree/master/ethwire)
   4. [ethdb](https://github.com/ethereum/eth-go/tree/master/ethdb)
   5. [ethutil](https://github.com/ethereum/eth-go/tree/master/ethutil)
+  6. [ethpipe](https://github.com/ethereum/eth-go/tree/master/ethpipe)
+  7. [ethvm](https://github.com/ethereum/eth-go/tree/master/ethvm)
+  8. [ethtrie](https://github.com/ethereum/eth-go/tree/master/ethtrie)
+  9. [ethreact](https://github.com/ethereum/eth-go/tree/master/ethreact)
+  10. [ethlog](https://github.com/ethereum/eth-go/tree/master/ethlog)
 
 The [eth](https://github.com/ethereum/eth-go) is the top-level package
 of the Ethereum protocol. It functions as the Ethereum bootstrapping and
@@ -45,7 +50,7 @@ Contribution
 
 If you'd like to contribute to Eth please fork, fix, commit and
 send a pull request. Commits who do not comply with the coding standards
-are ignored. If you send pull requests make absolute sure that you
+are ignored (use gofmt!). If you send pull requests make absolute sure that you
 commit on the `develop` branch and that you do not merge to master.
 Commits that are directly based on master are simply ignored.