rafalp/Misago — pull request #137 by kasperisager (2013-06-10 18:20:17+00:00)
Title: Merge #135 and #136 into develop

This simply syncs the `develop` branch with the two pull requests I sent you earlier (#135 and #136).