2 Commits

Author	SHA1	Message	Date
UdjinM6	a5ac60b868	Merge remote-tracking branch 'bitcoin/0.12' into HEAD ... + merge fixes + keepass on evhttp	2016-02-06 16:48:04 +03:00
Evan Duffield	78c5ca53f6	Merged in Darksend/InstantX/Masternodes ... This doesn't include any of the changes in the darkcoin/v0.10.18.x branch. Those will be brought over into this commit history.	2014-12-11 08:10:35 -07:00