todb/test-project-plz-ignore — pull request #1 by todb (2012-06-25 19:28:18+00:00)
Title: Update master with stuff from Branch/a

This should get straight up merged, no changes.