tribeiro/chimera — pull request #2 by wschoenell (2014-11-27 21:00:54+00:00)
Title: Fixes conflicts between chimera:master and tribeiro:new_scheduler

Voilà :+1: