Merge w master

This commit is contained in:
arkpar
2016-12-11 13:11:08 +01:00
parent 0e516162c3
commit 2c653d2c2e
4 changed files with 15 additions and 19 deletions

View File

@@ -15,8 +15,6 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use std::ops::{Deref, DerefMut};
use std::thread;
use std::time::{self, Duration};
use std::sync::Arc;
#[cfg(test)]