tag v0.5.1
b6d17a7b23f48d370a93858a2d73dd9416f717f8
Stephen Nelson <stephen@sfnelson.org>
2011-04-01 13:27:03 +1300

Fixed a couple of bugs


--------------------

Stephen Nelson:
	- fixed bug in test code, and added check for combat before updating macro text to prevent taint
