alterm4nn/ChronoZoom — pull request #272 by javierluraschi (2013-04-23 21:16:20+00:00)
Title: HotFix: Fixed merge conflict to enable collections

Fixed incorrect merge conflict in cz.ts that affects loading collections.