cfengine/core — pull request #456 by nickanderson (2013-03-21 21:55:37+00:00)
Title: Merge Nicks style guide

The only conflicting change is for attributes using 4 indents instead of 3. But this at least gets the conversation about the merge of my style guide going.