Merge pull request ethereum#12 from expanse-project/rebase-1.4.4

Rebase 1.4.4

.github/CONTRIBUTING.md

@@ -1,4 +1,5 @@
 If you'd like to contribute to go-expanse please fork, fix, commit and
+
 send a pull request. Commits who do not comply with the coding standards
 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.

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 #### System information
 
-Geth version: `geth version`
+Gexp version: `gexp version`
 OS & Version: Windows/Linux/OSX
 Commit hash : (if `develop`)
 

.gitignore

@@ -36,4 +36,7 @@ profile.tmp
 profile.cov
 
 .idea/workspace.xml
-*.idea/
+*.idea/
+
+# vagrant
+.vagrant

.mailmap

@@ -1,61 +1,3 @@
-Jeffrey Wilcke <[email protected]>
-Jeffrey Wilcke <[email protected]> <[email protected]>
-Jeffrey Wilcke <[email protected]> <[email protected]>
-Jeffrey Wilcke <[email protected]> <[email protected]>
-
-Viktor Trón <[email protected]>
-
-Joseph Goulden <[email protected]>
-
-Nick Savers <[email protected]>
-
-Maran Hidskes <[email protected]>
-
-Taylor Gerring <[email protected]>
-Taylor Gerring <[email protected]> <[email protected]>
-
-Bas van Kervel <[email protected]>
-Bas van Kervel <[email protected]> <[email protected]>
-Bas van Kervel <[email protected]> <[email protected]>
-
-Sven Ehlert <[email protected]>
-
-Vitalik Buterin <[email protected]>
-
-Marian Oancea <[email protected]>
-
-Christoph Jentzsch <[email protected]>
-
-Heiko Hees <[email protected]>
-
-Alex Leverington <[email protected]>
-Alex Leverington <[email protected]> <[email protected]>
-
-Zsolt Felföldi <[email protected]>
-
-Gavin Wood <[email protected]>
-
-Martin Becze <[email protected]>
-Martin Becze <[email protected]> <[email protected]>
-
-Dimitry Khokhlov <[email protected]>
-
-Roman Mandeleil <[email protected]>
-
-Alec Perseghin <[email protected]>
-
-Alon Muroch <[email protected]>
-
-Arkadiy Paronyan <[email protected]>
-
-Jae Kwon <[email protected]>
-
-Aaron Kumavis <[email protected]>
-
-Nick Dodson <[email protected]>
-
-Jason Carver <[email protected]>
-Jason Carver <[email protected]> <[email protected]>
-
-Joseph Chow <[email protected]>
-Joseph Chow <[email protected]> ethers <TODO>
+Christopher Franko <[email protected]>
+Dan Conway <[email protected]>
+James Clayton <[email protected]>

AUTHORS

@@ -3,22 +3,35 @@
 Alex Leverington <[email protected]>
 Alexandre Van de Sande <[email protected]>
 Bas van Kervel <[email protected]>
+Christoph Jentzsch <[email protected]>
+Christopher Franko <[email protected]>
 Daniel A. Nagy <[email protected]>
+Drake Burroughs <[email protected]>
+Enrique Fynn <[email protected]>
 Ethan Buchman <[email protected]>
 Fabian Vogelsteller <[email protected]>
 Felix Lange <[email protected]>
 Gustav Simonsson <[email protected]>
+Isidoro Ghezzi <[email protected]>
 Jae Kwon <[email protected]>
 Jason Carver <[email protected]>
-Jeffrey Wilcke <[email protected]>
-Joseph Chow <[email protected]>
+Jeff R. Allen <[email protected]>
+Jeffrey Wilcke <[email protected]>
+Joseph Chow <[email protected]>
 Kobi Gurkan <[email protected]>
+Lefteris Karapetsas <[email protected]>
+Leif Jurvetson <[email protected]>
 Maran Hidskes <[email protected]>
 Marek Kotewicz <[email protected]>
 Matthew Wampler-Doty <[email protected]>
 Nick Dodson <[email protected]>
+Peter Pratscher <[email protected]>
 Péter Szilágyi <[email protected]>
+Ramesh Nair <[email protected]>
+Ricardo Catalinas Jiménez <[email protected]>
+Rémy Roy <[email protected]>
 Taylor Gerring <[email protected]>
 Viktor Trón <[email protected]>
+Vincent G <[email protected]>
 Vitalik Buterin <[email protected]>
 Zsolt Felföldi <[email protected]>

COPYING.LESSER

@@ -79,7 +79,7 @@ layouts and accessors, or small macros, inline functions and templates
   4. Combined Works.
 
   You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
+taken togexper, effectively do not restrict modification of the
 portions of the Library contained in the Combined Work and reverse
 engineering for debugging such modifications, if you also do each of
 the following:
@@ -128,7 +128,7 @@ the following:
   5. Combined Libraries.
 
   You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
+Library side by side in a single library togexper with other library
 facilities that are not Applications and are not covered by this
 License, and convey such a combined library under terms of your
 choice, if you do both of the following: