tag v3.6
cf706bca386242e3e371f82671a179381b6909a5
Jordon <jordon@localhost>
2014-11-17 06:37:03 -0800

Tagging as v3.6


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

Jordon:
	- update cooldown list
