3 commits

Author	SHA1	Message	Date
md_5	5742900e16	Fix exp merging, oops	2013-01-25 18:25:18 +11:00
md_5	6b463d9614	Fix lightning - use vanilla lightning code.	2013-01-22 15:58:34 +11:00
md_5	c9bd55724e	Better item merging	2013-01-21 14:32:12 +11:00