Merge remote-tracking branch 'jgallagher/master' into vtab

tests/config_log.rs

@@ -1,7 +1,8 @@
 //! This file contains unit tests for rusqlite::trace::config_log. This function affects
 //! SQLite process-wide and so is not safe to run as a normal #[test] in the library.
 
-#[macro_use] extern crate lazy_static;
+#[macro_use]
+extern crate lazy_static;
 extern crate libc;
 extern crate rusqlite;