LearningRegistry/LearningRegistry — pull request #101 by wegrata (2011-10-11 18:43:07+00:00)
Title: Fixed merge conflicts from last pull request

Fixed merge conflicts from last pull request