# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1457286742 -3600
# Node ID 210d8329dc70d7d6644da079064aeea44f9e335c
# Parent  6e6eea2124c59be33cd772247bc3723dcd56067d# Parent  8c6943918279b9509a1401023ab395c6ed5f11b6
Merge trunk->0.10

diff -r 6e6eea2124c5 -r 210d8329dc70 core/storagemanager.lua
--- a/core/storagemanager.lua	Sat Mar 05 23:44:57 2016 +0000
+++ b/core/storagemanager.lua	Sun Mar 06 18:52:22 2016 +0100
@@ -123,14 +123,12 @@
 			if current == nil then
 				if err then
 					return nil, err;
-				else
-					current = keydatas;
 				end
-			else
-				for k,v in pairs(keydatas) do
-					if v == self.remove then v = nil; end
-					current[k] = v;
-				end
+				current = {};
+			end
+			for k,v in pairs(keydatas) do
+				if v == self.remove then v = nil; end
+				current[k] = v;
 			end
 			return self.keyval_store:set(username, current);
 		end;