aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth/main.go
Commit message (Expand)AuthorAgeFilesLines
* accounts: refactor API for generalized USB walletsPéter Szilágyi2017-08-091-1/+3
* accounts, console, internal: support trezor hardware walletPéter Szilágyi2017-08-091-6/+10
* cmd: add makecache cmd, use caches during import cmdPéter Szilágyi2017-08-041-0/+1
* cmd, core, eth: journal local transactions to disk (#14784)Péter Szilágyi2017-07-281-0/+2
* cmd, core: add --txpool.nolocals to disable local price exemptionsPéter Szilágyi2017-07-051-0/+1
* Merge pull request #14540 from bas-vk/whisper-apiPéter Szilágyi2017-06-261-1/+7
|\
| * whisper: move flags from whisper package to utilsBas van Kervel2017-06-211-2/+7
| * whisperv5: integrate whisper and add whisper RPC simulatorBas van Kervel2017-06-151-1/+2
* | cmd/geth: corrently init gas price for CLI CPU miningPéter Szilágyi2017-06-221-0/+4
|/
* cmd, core, eth: configurable txpool parametersPéter Szilágyi2017-05-291-0/+7
* cmd, node: support different bootnodes, fix default light portPéter Szilágyi2017-05-101-0/+2
* Merge pull request #14418 from karalabe/rinkeby-flagPéter Szilágyi2017-05-041-1/+2
|\
| * cmd, core, params: add --rinkeby flag for fast connectivityPéter Szilágyi2017-05-041-1/+2
* | cmd/geth: reorganise console/attach commands/flagsBas van Kervel2017-05-031-47/+51
|/
* cmd, node: add --nosub and node.Config.NoUSB to disable hw walletsPéter Szilágyi2017-04-201-0/+1
* cmd/geth: update flag groups in the geth command usagePéter Szilágyi2017-04-131-1/+1
* cmd/utils, node: remove unused solc references and improve RPC config (#14324)bas-vk2017-04-131-1/+0
* cmd/geth: add --config file flag (#13875)Felix Lange2017-04-121-55/+4
* eth: accept transactions when starting CPU mining (#13882)Péter Szilágyi2017-04-101-1/+1
* Merge pull request #13870 from karalabe/miners-fixesPéter Szilágyi2017-04-071-6/+0
|\
| * cmd/geth, eth: drop bad block reporting, its offline anywayPéter Szilágyi2017-04-061-6/+0
* | cmd, les, eth, eth/gasprice: using new gas price oracle (#13853)Felföldi Zsolt2017-04-061-6/+2
|/
* core, consensus: pluggable consensus engines (#3817)Péter Szilágyi2017-04-051-1/+9
* all: finish integrating Go ethash, delete C++ vendorPéter Szilágyi2017-03-091-1/+1
* cmd, eth, les, node, pow: disk caching and progress reportsPéter Szilágyi2017-03-091-0/+5
* * cmd/geth: add --nocompaction flag + multiple import filesMartin Holst Swende2017-03-081-0/+1
* Logger updates 3 (#3730)Péter Szilágyi2017-03-021-7/+7
* cmd/geth: drop upgradedb subcommand since it's unfeasiblePéter Szilágyi2017-02-231-1/+0
* cmd, whisper/mailserver: revert to utils.FatalfPéter Szilágyi2017-02-231-4/+4
* all: blidly swap out glog to our log15, logs need reworkPéter Szilágyi2017-02-231-13/+12
* cmd/geth: added 'geth bug' command (#3684)Jeffrey Wilcke2017-02-201-0/+1
* params: core, core/vm, miner: 64bit gas instructionsJeffrey Wilcke2017-02-141-1/+1
* Revert "params: core, core/vm, miner: 64bit gas instructions (#3514)"Jeffrey Wilcke2017-02-131-1/+1
* accounts: ledger and HD review fixesPéter Szilágyi2017-02-131-2/+3
* accounts/usbwallet: make wallet responsive while Ledger is busyPéter Szilágyi2017-02-131-0/+8
* accounts, cmd, internal, node: implement HD wallet self-derivationPéter Szilágyi2017-02-131-2/+30
* accounts, cmd, eth, internal, miner, node: wallets and HD APIsPéter Szilágyi2017-02-131-1/+1
* accounts, cmd, eth, internal, mobile, node: split account backendsPéter Szilágyi2017-02-131-2/+4
* params: core, core/vm, miner: 64bit gas instructions (#3514)Jeffrey Wilcke2017-02-021-1/+1
* Merge pull request #3579 from bas-vk/natspecPéter Szilágyi2017-01-171-1/+0
|\
| * cmd,eth,les,internal: remove natspec supportBas van Kervel2017-01-171-1/+0
* | cmd/geth, core: add support for recording SHA3 preimages (#3543)Nick Johnson2017-01-171-0/+1
|/
* core: remove support for Olympic networkBas van Kervel2017-01-121-1/+0
* logger, pow/dagger, pow/ezp: delete dead codeFelix Lange2017-01-071-1/+0
* cmd/geth: tidied up the source (#3385)Péter Szilágyi2016-11-301-133/+9
* cmd: drop DAO related choice flags since ETC divergedPéter Szilágyi2016-11-291-2/+0
* cmd, ethstats, les, mobile, params: native netstats (#3336)Péter Szilágyi2016-11-251-7/+28
* Merge pull request #3325 from fjl/p2p-netrestrictFelix Lange2016-11-251-0/+1
|\
| * cmd/bootnode, cmd/geth, cmd/bzzd: add --netrestrictFelix Lange2016-11-231-0/+1
* | cmd/geth, core, light, mobile: removed state account StartingNonceJeffrey Wilcke2016-11-231-5/+0
|/
* cmd/geth: improve command help messages (#3227)Kenji Siu2016-11-101-18/+25
* cmd/geth: reinstate dropped --cache flagPéter Szilágyi2016-11-101-0/+1
* p2p/discv5: added new topic discovery packageZsolt Felfoldi2016-11-091-28/+1
* cmd, eth: added light client and light server modeszsfelfoldi2016-11-091-0/+30
* Godeps, vendor: convert dependency management to trash (#3198)Péter Szilágyi2016-10-291-43/+1
* cmd, core/state: allow configurable trie cache generationsPéter Szilágyi2016-10-191-1/+2
* node: ensure datadir can be co-inhabited by different instancesFelix Lange2016-09-161-11/+5
* cmd, eth: drop the blockchain version from cli/eth configsPéter Szilágyi2016-09-151-1/+0
* cmd/evm, cmd/geth, cmd/utils: move version handling to cmd/utilsFelix Lange2016-09-051-55/+31
* contracts/release: move package release to contracts/Felix Lange2016-08-301-1/+1
* cmd/geth: set correct initial nonce on testnet for import/init subcommands (#...Hellsegga2016-08-231-0/+5
* cmd/geth: added copyright and license informationJeffrey Wilcke2016-08-221-0/+23
* cmd/utils, node: create account manager in package nodeFelix Lange2016-08-171-28/+34
* cmd, core, eth, params: implement flags to control dao fork blocksPéter Szilágyi2016-07-151-7/+2
* cmd/geth: print version on geth start (#2622)Matthew Di Ferrante2016-07-121-0/+2
* cmd, common, console, eth, release: drop redundant "full"sPéter Szilágyi2016-06-301-1/+1
* eth: separate common and full node-specific API and backend servicezsfelfoldi2016-06-161-3/+7
* cmd: fix CLI package deprecation warningsPéter Szilágyi2016-06-101-6/+14
* cmd/geth: codegansta/cli package renamed to urfave/cliBas van Kervel2016-06-091-1/+1
* cmd/geth, console: fix reviewer issuesPéter Szilágyi2016-05-311-1/+1
* cmd, console: split off the console into a reusable packagePéter Szilágyi2016-05-301-134/+6
* eth: enable bad block reportsFelix Lange2016-05-251-0/+6
* cmd/geth: fixed to use proper version string for outputJeffrey Wilcke2016-05-031-1/+1
* cmd/geth, release: polish and deploy live release contractPéter Szilágyi2016-05-021-1/+1
* release, all: integrate the release service into gethPéter Szilágyi2016-05-021-22/+37
* Merge pull request #2485 from karalabe/fakepowPéter Szilágyi2016-04-291-0/+1
|\
| * cmd: add a `--fakepow` flag to help benchmarking database changesPéter Szilágyi2016-04-211-0/+1
* | Merge pull request #2478 from fjl/geth-js-tweakFelix Lange2016-04-261-3/+19
|\ \ | |/ |/|
| * cmd/geth, jsre: improve the js commandFelix Lange2016-04-211-3/+19
* | VERSION, cmd/geth: bumped versionJeffrey Wilcke2016-04-201-2/+2
|/
* cmd/geth: move account commands to accountcmd.goFelix Lange2016-04-121-258/+3
* cmd/geth, cmd/utils: improve input handlingFelix Lange2016-04-121-2/+3
* Merge pull request #2359 from bas-vk/rpc-optional-argsJeffrey Wilcke2016-04-121-1/+1
|\
| * rpc: various fixes/enhancementsBas van Kervel2016-04-121-1/+1
* | cmd/geth: add JS preload parameterBas van Kervel2016-04-111-0/+15
|/
* cmd/geth: add missing gas target flag (fixing 0 convergence issue)Péter Szilágyi2016-04-041-0/+1
* cmd/geth, eth: move --genesis deprecation warning to cmd/gethFelix Lange2016-04-021-0/+6
* core: added basic chain configurationJeffrey Wilcke2016-04-011-3/+39
* core: Added EVM configuration optionsJeffrey Wilcke2016-03-241-1/+0
* cmd/utils: add --keystoreKobi Gurkan2016-03-081-0/+1
* cmd, node, rpc: readd inproc RPC client, expose via nodePéter Szilágyi2016-02-091-2/+2
* cmd, common, node, rpc: rework naming convention to canonical onePéter Szilágyi2016-02-091-3/+3
* cmd, node, rpc: move websockets into node, break singletonPéter Szilágyi2016-02-051-11/+10
* cmd, common, node, rpc: move HTTP RPC into node, drop singletone aspectPéter Szilágyi2016-02-051-5/+0
* cmd, common, node, rpc: move IPC into the node itselfPéter Szilágyi2016-02-041-6/+1
* internal/debug: APIs for profiling and tracingFelix Lange2016-01-281-14/+14
* rpc: migrated the RPC insterface to a new reflection based RPC layerBas van Kervel2016-01-261-25/+26
* Merge pull request #2035 from bas-vk/rcp-v2-rebaseFelix Lange2015-12-151-0/+1
|\
| * rpc: new RPC implementation with pub/sub supportBas van Kervel2015-12-141-0/+1
* | Makefile, cmd/geth: assemble ios xcode frameworksPéter Szilágyi2015-12-091-1/+2
|/
* cmd/utils: restore starting geth without any accounts and etherbaseFelix Lange2015-12-011-2/+5
* cmd, eth, node, rpc, xeth: use single-instance servicesPéter Szilágyi2015-11-271-1/+1
* cmd, common, core, eth, node, rpc, tests, whisper, xeth: use protocol stacksPéter Szilágyi2015-11-271-197/+110
* cmd/geth, cmd/utils: removed legaleseJeffrey Wilcke2015-11-191-26/+0
* cmd/geth, cmd/utils: surface the light KDF flag to the CLIPéter Szilágyi2015-11-101-0/+1
* cmd/geth: fix recover command crash if no param is suppliedPéter Szilágyi2015-11-051-2/+2
* VERSION, cmd/geth: bumped version 1.4.0Jeffrey Wilcke2015-11-031-2/+2
* cmd/geth, cmd/utils, eth: group CLI flags by purposePéter Szilágyi2015-10-301-4/+1
* console:zelig2015-10-221-31/+35
* eth: clean out light node notions from ethPéter Szilágyi2015-10-191-3/+1
* cmd, eth: support switching client modes of operationPéter Szilágyi2015-10-191-0/+1
* Merge pull request #1869 from Gustav-Simonsson/gpu_minerJeffrey Wilcke2015-10-161-1/+44
|\
| * all: Add GPU mining, disabled by defaultGustav Simonsson2015-10-071-1/+44
* | Merge pull request #1888 from obscuren/testnetJeffrey Wilcke2015-10-091-0/+1
|\ \
| * | cmd, core, eth: added official testnetJeffrey Wilcke2015-10-091-0/+1
* | | cmd: properly initialize Olympic for all subcommandsPéter Szilágyi2015-10-071-3/+1
* | | Merge pull request #1851 from bas-vk/historyfileJeffrey Wilcke2015-10-071-0/+1
|\ \ \ | |/ / |/| |
| * | console/history respect datadirBas van Kervel2015-09-251-0/+1
* | | cmd/geth: dev version numberJeffrey Wilcke2015-10-061-2/+2
* | | cmd/geth, cmd/utils, core, rpc: renamed to blockchainJeffrey Wilcke2015-10-041-1/+1
| |/ |/|
* | common: fix #1818, secondary datadir paths to fall back toPéter Szilágyi2015-10-011-12/+12
|/
* cmd/geth: changed version number to 1.2.0Jeffrey Wilcke2015-09-211-2/+2
* cmd/geth: extradata is correcly initialized with consoleKobi Gurkan2015-09-171-1/+3
* cmd/geth: adds extradata flagKobi Gurkan2015-09-161-1/+15
* core: split out TD from database and all internalsPéter Szilágyi2015-09-111-4/+3
* cmd/geth, cmd/utils, eth: added dev mode flagJeffrey Wilcke2015-09-091-0/+1
* cmd/geth: honor datadir when attachingKobi Gurkan2015-09-031-1/+1
* eth, eth/downloader: handle header requests, table driven proto testsPéter Szilágyi2015-08-241-0/+2
* cmd/geth: bumped version 1.1.0Jeffrey Wilcke2015-08-211-3/+3
* cmd/geth: bumped version 1.0.3Jeffrey Wilcke2015-08-201-2/+2
* geth: bumped version 1.0.2Jeffrey Wilcke2015-08-201-2/+2
* Revert "fdtrack: temporary hack for tracking file descriptor usage"Jeffrey Wilcke2015-08-201-4/+0
* Merge pull request #1642 from ethereum/fix-js-console-windowsJeffrey Wilcke2015-08-141-19/+0
|\
| * cmd/geth, jsre: restore command line editing on windowsFelix Lange2015-08-121-19/+0
* | Merge pull request #1635 from bas-vk/useragentJeffrey Wilcke2015-08-141-1/+1
|\ \
| * | support for user agentsBas van Kervel2015-08-121-1/+1
| |/
* / cmd/geth: remove spaces in client identifierFelix Lange2015-08-121-1/+1
|/
* cmd/geth, core/vm: setup vm settings and defaulted JIT disabledJeffrey Wilcke2015-08-091-0/+1
* Merge pull request #1490 from obscuren/jit-vmJeffrey Wilcke2015-08-081-0/+3
|\
| * core/vm, tests: implemented semi-jit vmJeffrey Wilcke2015-08-071-0/+3
* | string version for build servercaktux2015-08-081-1/+1
* | cmd/geth, eth: added canonical extra dataJeffrey Wilcke2015-08-071-2/+30
|/
* fake commit for build server :(Jeffrey Wilcke2015-08-061-1/+1
* cmd/geth: bumped version numberJeffrey Wilcke2015-08-061-1/+1
* Merge pull request #1574 from fjl/fdtrackJeffrey Wilcke2015-08-041-0/+4
|\
| * fdtrack: temporary hack for tracking file descriptor usageFelix Lange2015-08-041-0/+4
* | cmd, core, eth: support for the olympic networkJeffrey Wilcke2015-08-041-0/+4
|/
* cmd/geth, core, eth: Version 1.0.0Jeffrey Wilcke2015-07-251-2/+1
* Merge pull request #1510 from fjl/license-fixesJeffrey Wilcke2015-07-231-2/+2
|\
| * all: update license headers to distiguish GPL/LGPLFelix Lange2015-07-231-2/+2
* | Merge pull request #1508 from karalabe/database-cachingJeffrey Wilcke2015-07-231-1/+2
|\ \ | |/ |/|
| * cmd, core, eth, ethdb: cache flag to allocate memory for db internal usePéter Szilágyi2015-07-221-1/+2
* | Update disclaimerTaylor Gerring2015-07-211-3/+24
|/
* Prompt user to accept legalese when datadir doesn't existTaylor Gerring2015-07-161-0/+5
* cmd, core, eth, common: genesis preparationJeffrey Wilcke2015-07-101-0/+1
* cmd/geth: bump version 0.9.39Jeffrey Wilcke2015-07-101-1/+1
* cmd/geth: version bump 0.9.38Jeffrey Wilcke2015-07-091-1/+1
* cmd/geth, cmd/utils: changed ParamsToAddress to return errorJeffrey Wilcke2015-07-071-9/+12
* cmd/geth: version number 0.9.36Jeffrey Wilcke2015-07-071-1/+1
* all: add some godoc synopsis commentsFelix Lange2015-07-071-0/+1
* all: remove @author commentsFelix Lange2015-07-071-4/+0
* all: update license informationFelix Lange2015-07-071-16/+16
* cmd,eth,rpc,tests: default coinbaseJeffrey Wilcke2015-07-071-16/+1
* cmd/geth, cmd/utils: improve interrupt handlingFelix Lange2015-07-061-3/+1
* account update: migrate or change passwordzelig2015-07-031-7/+61
* no primary when listing accountszelig2015-07-031-4/+2
* unlock multiple passes and obsolete primaryzelig2015-07-031-16/+22
* Merge pull request #1351 from karalabe/eth61Jeffrey Wilcke2015-07-011-2/+1
|\
| * cmd/geth, cmd/utils, eth: advertise both eth/60 and eth/61Péter Szilágyi2015-07-011-2/+1
* | core, cmd/geth: improved recover functionalityJeffrey Wilcke2015-07-011-7/+29
* | core, cmd/geth: recover by numberJeffrey Wilcke2015-07-011-0/+24
|/
* cmd/geth: version bump 0.9.35Jeffrey Wilcke2015-06-301-1/+1
* cmd/geth: version bump 0.9.34Jeffrey Wilcke2015-06-301-1/+1
* cmd, core, eth, metrics, p2p: require enabling metricsPéter Szilágyi2015-06-301-0/+1
* cmd/geth, metrics: separate process metric collection, add diskPéter Szilágyi2015-06-301-22/+2
* cmd/geth: finalize mem statsPéter Szilágyi2015-06-251-6/+6
* cmd/geth: add memory stat collection tooPéter Szilágyi2015-06-251-0/+24
* cmd/geth: add attach and rows flags to the monitor commandPéter Szilágyi2015-06-251-10/+1
* cmd/geth, rpc/api: extend metrics API, add a basic monitor commandPéter Szilágyi2015-06-241-0/+10
* cmd/geth: version bump 0.9.33Jeffrey Wilcke2015-06-241-1/+1
* cmd/geth: bumpJeffrey Wilcke2015-06-241-1/+1
* fixed relative path issue with javascript filesBas van Kervel2015-06-231-3/+3
* improved action descriptionBas van Kervel2015-06-231-1/+1
* added batch support to console and attach actionsBas van Kervel2015-06-221-4/+13
* added attach over ipc commandBas van Kervel2015-06-221-0/+46
* removed old rpc structure and added new inproc api clientBas van Kervel2015-06-221-2/+7
* refactored old rpc structure to newBas van Kervel2015-06-221-0/+1
* cmd/geth: bump 0.9.31obscuren2015-06-161-1/+1
* cmd/geth: bump version number 0.9.30obscuren2015-06-161-1/+1
* fixed saving receiptszsfelfoldi2015-06-151-0/+6
* fixed windows ipc path issueBas van Kervel2015-06-121-2/+2
* ipc socket always used default pathBas van Kervel2015-06-121-1/+1
* changed send methods for backwards compatability in geth consoleBas van Kervel2015-06-111-2/+0
* added console commandBas van Kervel2015-06-111-0/+2
* changed send methods for backwards compatability in geth consoleBas van Kervel2015-06-111-2/+2
* added console commandBas van Kervel2015-06-111-0/+2
* added API/IPC commandline flagsBas van Kervel2015-06-111-0/+8
* cmd/geth: develop version bump 0.9.29obscuren2015-06-101-1/+1
* cmd/geth: bumped version number 0.9.28obscuren2015-06-101-1/+1
* core: settable genesis nonceobscuren2015-06-091-0/+1
* cmd/geth: version bump 0.9.27obscuren2015-06-051-1/+1
* cmd/geth: bump version v0.9.26obscuren2015-05-281-1/+1
* Validate account length and avoid slicing in loggingGustav Simonsson2015-05-281-2/+2
* cmd/geth, cmd/utils: rename utils.Get* -> utils.Make*Felix Lange2015-05-281-4/+4
* cmd/geth: move blockchain commands to chaincmd.goFelix Lange2015-05-281-146/+7
* cmd/geth, cmd/utils: don't use Ethereum for import, export and upgradedbFelix Lange2015-05-281-80/+33
* cmd/geth: bump version 0.9.25obscuren2015-05-271-1/+1
* cmd/geth: Flush instead of close. This solves a nil ptr errorobscuren2015-05-271-6/+6
* cmd/geth, cmd/utils, eth, p2p: pass and honor a no discovery flagPéter Szilágyi2015-05-271-0/+1
* cmd/geth: bumped version to 0.9.24obscuren2015-05-261-1/+1
* cmd/geth: bump version 0.9.23obscuren2015-05-221-1/+1
* automatic DAG pregeneration for smooth epoch transitionszelig2015-05-211-1/+2
* add usage doc to wallet importzelig2015-05-201-1/+9
* solc now in ethereum, fixes solc path setting; setSolc() didnt workzelig2015-05-201-2/+0
* Support multiple account unlock attemptsTaylor Gerring2015-05-201-3/+10
* Allow unlocking multiple accounts #1045Taylor Gerring2015-05-201-9/+13
* Refactor user prompts into utilsTaylor Gerring2015-05-191-46/+3
* Add user confirmation for removedbTaylor Gerring2015-05-191-5/+40
* Add "removedb" command to GethTaylor Gerring2015-05-181-0/+15
* Merge branch 'hotfix/0.9.22' into developobscuren2015-05-181-1/+1
|\
| * cmd/geth: fixed ver numobscuren2015-05-181-1/+1
* | cmd/geth: delete state db on upgradedb commandobscuren2015-05-161-0/+1
|/
* cmd/geth: hotfix bumpobscuren2015-05-161-1/+1
* core, cmd/geth, cmd/mist: cleanup. bump version 0.9.21obscuren2015-05-161-3/+1
* removed invalid filename charactersBas van Kervel2015-05-131-1/+1
* Fix hex conversion in --unlock and log when successfulGustav Simonsson2015-05-131-1/+2
* cmd/geth: bump version to 0.9.20obscuren2015-05-131-1/+1
* Use common.Address type for accounts.AddressGustav Simonsson2015-05-121-5/+4
* replaced several path.* with filepath.* which is platform independentBas van Kervel2015-05-121-3/+2
* cmd/geth, miner, backend, xeth: Fixed miner threads to be settableobscuren2015-05-111-1/+1
* cmd/geth, cmd/mist: version 0.9.19obscuren2015-05-101-1/+1
* cmd/geth: bump version 0.9.18obscuren2015-05-091-1/+1
* cmd/geth, cmd/mist, eth, flags: renamed loglevel to verbosityobscuren2015-05-091-1/+2
* version 0.9.17obscuren2015-05-081-1/+1
* Merge pull request #840 from karalabe/throttled-dialingJeffrey Wilcke2015-05-081-0/+1
|\
| * cmd, eth, p2p: introduce pending peer cli arg, add testsPéter Szilágyi2015-05-071-0/+1
* | solidity compiler and contract metadocs integrationzelig2015-05-071-2/+18
|/
* cmd/geth: gofmt screwup fixobscuren2015-05-071-0/+2
* cmd/geth: version bumpobscuren2015-05-071-3/+1
* Integrate new ethash API and change geth makedag cmdGustav Simonsson2015-05-051-6/+28
* cmd/geth: fix #853 colorize console output in windowsPéter Szilágyi2015-05-051-2/+12
* cmd/geth, eth: bump version & tmp fix for incorrect TD peersobscuren2015-05-031-1/+1
* cmd/geth: bump version to 0.9.14obscuren2015-04-301-1/+1
* Merge pull request #825 from obscuren/developJeffrey Wilcke2015-04-291-1/+1
|\
| * cmd/geth: bump version numberobscuren2015-04-291-1/+1
* | cmd/geth, cmd/mist: use gitCommit in node nameFelix Lange2015-04-291-14/+27
|/
* geth/main: removed crazy welcome message :-(obscuren2015-04-261-1/+2
* Merge pull request #805 from obscuren/download_improvementsJeffrey Wilcke2015-04-251-1/+1
|\
| * cmd/geth: bump version number 0.9.12obscuren2015-04-251-1/+1
* | Merge pull request #773 from ethersphere/frontier/cliJeffrey Wilcke2015-04-241-13/+17
|\ \