Merge branch 'functions' of https://github.com/gwenn/rusqlite into gwenn-functions

Conflicts:
	Cargo.toml
	src/lib.rs

src/lib.rs

@@ -85,6 +85,7 @@ mod transaction;
 #[cfg(feature = "load_extension")]mod load_extension_guard;
 #[cfg(feature = "trace")]pub mod trace;
 #[cfg(feature = "backup")]pub mod backup;
+#[cfg(feature = "functions")] pub mod functions;
 
 /// A typedef of the result returned by many methods.
 pub type SqliteResult<T> = Result<T, SqliteError>;