Merge branch 'master' into auth-bft

2016-12-10 18:14:35 +01:00
parent 1611d190ba a6fcd8a0d9
commit f3af0f46be
53 changed files with 441 additions and 428 deletions
--- a/json/src/misc/account_meta.rs
+++ b/json/src/misc/account_meta.rs
@@ -29,7 +29,7 @@ pub struct AccountMeta {
 	pub name: String,
 	/// The rest of the metadata of the account.
 	pub meta: String,
-	/// The 128-bit UUID of the account, if it has one (brain-wallets don't).
+	/// The 128-bit Uuid of the account, if it has one (brain-wallets don't).
 	pub uuid: Option<String>,
 }