Daniel0108/TouchNet — pull request #2 by Daniel0108 (2012-02-03 17:19:09+00:00)
Title: Module manager finished

Merging from the test branch into master. The module manager is finished, the tests with it are over.