saltstack/salt — pull request #1726 by bretep (2012-07-30 06:32:05+00:00)
Title: Cleanup formatting in master.py

This just removes the old style formatting and simplifies some of the new style. I've tested on RHEL 6.2 and master/minion both run and log correctly after these changes were made.