Merge from trivial #6135

pull theuni wants to merge 13 commits into bitcoin:master from theuni:trivial-rebased changing 13 files +48 −53

theuni commented at 5:05 AM on May 14, 2015: member

Nothing controversial, I think. A few unneeded class/struct re-arrangements slipped in, but no reason to grab the pitchforks.

addrman: update comments

nUnkBias was removed in https://github.com/bitcoin/bitcoin/pull/5941

605a735425

[Trivial] Cryptocurrency is one word

Cryptocurrency was added to Oxford Dictionaries Online in May 2014.

8e9248d96b

Comment edits and cleanup

Original PR here: https://github.com/bitcoin/bitcoin/pull/6044

f13dac972c

laanwj commented at 9:44 AM on May 14, 2015: member

ACK
paveljanik commented at 10:42 AM on May 14, 2015: contributor

ACK (The change like https://github.com/theuni/bitcoin/commit/3b00e7c231648cfe0c36c5f9f0c44953146c1a5b can be replicated across the whole tree)
fanquake commented at 11:39 AM on May 14, 2015: member

ACK

On Thursday, May 14, 2015, paveljanik notifications@github.com wrote:

ACK (The change like theuni@3b00e7c https://github.com/theuni/bitcoin/commit/3b00e7c231648cfe0c36c5f9f0c44953146c1a5b can be replicated across the whole tree)

Reply to this email directly or view it on GitHub #6135 (comment).
sipa commented at 3:37 PM on May 14, 2015: member

ACK
gavinandresen commented at 4:08 PM on May 14, 2015: contributor

ACK
Diapolo commented at 7:48 AM on May 15, 2015: none

ACK
laanwj merged this on May 15, 2015
laanwj closed this on May 15, 2015
laanwj referenced this in commit e47c94e64c on May 15, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors