water/mainline — pull request #182 by jesjos (2012-06-10 08:58:45+00:00)
Title: Feature/remove unused

Jag har rensat med stora kvasten.