Tomasz Drwięga bf4ab6daa8 Merge branch 'master' into webapps2 ...

Conflicts:
	parity/main.rs

2016-04-07 16:13:58 +02:00

..

main.rs

Merge branch 'master' into webapps2

2016-04-07 16:13:58 +02:00

price_info.rs

Fixing warnings

2016-04-06 10:55:40 +02:00