Updated Task timers for new task types and fixed a few bugs with them
Authored by: achalk124 2014-01-15
Parent: [r507]
Child: [r509]