Merged in rhaas/sched (pull request #47)
Cactus: fix regex used to check for Cactus timebins
Cactus: restoe ERROR when trying to schedule in unknown timebin
Cactus: whitespace only changes
Cactus: fix regex used to check for Cactus timebins
Cactus: restoe ERROR when trying to schedule in unknown timebin
Cactus: whitespace only changes