Merge branch 'master' of github.com:quietust/dfhack

Conflicts:
	plugins/showmood.cpp
develop
Quietust 2012-01-24 10:04:34 -06:00
commit 1ca90de647

Diff Content Not Available