MapofLife/MOL — pull request #168 by tomauer (2012-11-26 16:15:12+00:00)
Title: Test to see if this is automatically mergeable

Don't merge this yet, I haven't tested it. I just want to see if the rebase worked.