Merge branch 'Mirio/catharsis' into 'master'
authorMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 18:06:20 +0000 (18:06 +0000)
committerMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 18:06:20 +0000 (18:06 +0000)
commitc81a22e1f4ce5ac3fe2af503273cf4e387a09484
treeab49cb9eb0314eb7eb7964863b212192f6020d12
parent30071e1cf51f733e61d5b245b164ab302cc784bf
parentbea996f62b7f82f0ca466748632401a15ce574de
Merge branch 'Mirio/catharsis' into 'master'

Mirio/catharsis

Fixes #101

See merge request !35