106 Commits

Author	SHA1	Message	Date
Gav Wood	26da38a439	Merge remote-tracking branch 'origin/master' into vmtracing	2016-06-02 11:40:39 +02:00
Nikolay Volf	c00b84e10b	merge fixes	2016-06-01 12:54:47 +02:00
Nikolay Volf	0c782bf34b	Merge branch 'master' into client-refact	2016-06-01 12:45:04 +02:00
Nikolay Volf	d45a676dc0	all tests fixed	2016-05-31 22:24:32 +02:00
Nikolay Volf	a845e08bc6	rename of the trait	2016-05-31 20:33:26 +02:00
Nikolay Volf	8e252d5f1b	refactored to merge client & client	2016-05-31 19:52:53 +02:00