EJanuszewski/CMS — pull request #3 by ninetwozero (2013-06-23 10:09:17+00:00)
Title: Setup refactoring

Refactoring the setup further, to be on par with the changes from yesterdays pul request.