bartTC/dpaste — pull request #17 by Krinkle (2013-04-23 04:30:06+00:00)
Title: Merge Krinkle's cleanup branch

See individual commits.