umbraco/OurUmbraco — pull request #23 by leekelleher (2013-06-10 14:34:56+00:00)
Title: Resolved recent merge conflicts

Fixed recent merge conflicts.