# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1458594315 0
# Node ID 66873c5e206178ecd8ae8e2cbdbbddf057549345
# Parent  397f45107795c465df174052fe469e457a86c4d8# Parent  4711893428900f741fac048dbb30935b38730f92
Merge 0.10->trunk

diff -r 397f45107795 -r 66873c5e2061 util/iterators.lua
--- a/util/iterators.lua	Mon Mar 21 14:52:43 2016 +0100
+++ b/util/iterators.lua	Mon Mar 21 21:05:15 2016 +0000
@@ -135,8 +135,8 @@
 	return function (_s, _var)
 		local ret;
 		repeat ret = pack(f(_s, _var));
-			var = ret[1];
-		until var == nil or filter(unpack(ret, 1, ret.n));
+			_var = ret[1];
+		until _var == nil or filter(unpack(ret, 1, ret.n));
 		return unpack(ret, 1, ret.n);
 	end, s, var;
 end