Zidisha/zidisha2 — pull request #367 by jonasdt (2014-09-29 16:58:07+00:00)
Title: Revert "Different fixes"

Reverts Zidisha/zidisha2#366