stephenmcd/cartridge — pull request #151 by clemensbasti (2013-12-16 14:38:44+00:00)
Title: Upgrade settings as in Mezzanine (merged)

I merged the changes made in Mezzanine to Cartridge.