tag v1.2.1
2dbca1acc33e0b77e65be0f8b194b3b8af631d93
JC Ford <johncford@gmail.com>
2012-12-01 10:37:32 -0500

Tagging v1.2.1


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

JC Ford:
	- Fixed missing option text. Fixed hide in combat bug.
