tag v1.1.4.1
ed329625d24e3764f78cc4a849cb1f45bcc10164
Daedhir <daedhir@gmail.com>
2012-09-08 21:29:47 -0600

Tagging as v1.1.4.1


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

Daedhir:
	- Fixed merge
	- TOC bump
