johannes0520/Textress — pull request #2 by daveology (2014-02-25 01:10:22+00:00)
Title: Merging.

Hopefully this is done correctly.