hassox/warden — pull request #54 by grosser (2012-06-07 00:29:10+00:00)
Title: All my 3 pulls merged into one

There was a merge conflict, so if you want all of them, just merge this and you'll avoid the conflict :)