bytes received/sent resolve merge conflict #699

Merged

Atheros1 merged 3 commits from master into master

2014-08-01 23:27:52 +02:00

Author	SHA1	Message	Date
Jonathan Warren	9e16e81283	resolve merge conflict and show transfer rate	2014-08-01 17:25:47 -04:00
Yuri	f05bcdb829	Made sent/received byte counts to be in human readable format.	2014-07-11 11:12:58 -07:00
Yuri	f107b0fbd9	Addition of bytes received/sent counts on the network information tab.	2014-07-07 13:30:23 -07:00