wisesascha/Wise-Exposition — pull request #3 by davewise (2012-08-26 17:11:25+00:00)
Title: Fixed merge issues.

Our masters should be in sync after this pull.