MarkUsProject/Markus — pull request #775 by jerboaa (2012-06-26 13:06:16+00:00)
Title: Issue 651

I've resolved the merge conflict and this should be ready to get merged again. It's the follow-up of PR #727.