jbuehring/TestCore — pull request #2 by mancow (2011-11-03 16:37:13+00:00)
Title: Merge complete.

Fixed the fucking conflict.